circle_speech_balloon 0.0.6 → 0.0.7

data/app/assets/javascripts/circle_speech_balloon/application.js

@@ -10,6 +10,4 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require jquery
-//= require jquery_ujs
 //= require_tree .

data/app/assets/javascripts/circle_speech_balloon/balloons.js.coffee

@@ -0,0 +1,41 @@
+$ ->
+  # balloon r helper
+  balloon_input_r = (btn)  ->
+    wrapper = $(btn).parent()
+    balloon_trace = '#panel' + $(wrapper).attr('panel_id') + 'speech_balloon' + $(wrapper).attr('element_id') + 'balloon' + $(wrapper).attr('element_part_id')
+    input_r = $(balloon_trace + 'r')
+    input_r
+  balloon_r_step = (btn)  ->
+    wrapper = $(btn).parent()
+    r_step = parseFloat(wrapper.attr('r_step'))
+    r_step
+  balloon_index = (btn, r_step)  ->
+    v = parseInt(balloon_input_r(btn).val())
+    tr = v % 360
+    tr = 360 + tr if tr < 0
+    offset = r_step / 2.0
+    idx = Math.floor((tr + offset) / r_step)
+    idx
+  
+  $('input').map  ->
+    if $(@).attr('element_type') and $(@).attr('element_type') == 'speech_balloon' and $(@).attr('column') == 'r'
+      $(@).spinner()
+  
+  $('.r-down').map -> 
+    $(@).click -> 
+      r_step = balloon_r_step($(@))
+      idx = balloon_index($(@), r_step)
+      rv = Math.floor((idx - 1) * r_step)
+      balloon_input_r($(@)).val(rv)
+  $('.r-up').map -> 
+    $(@).click -> 
+      r_step = balloon_r_step($(@))
+      idx = balloon_index($(@), r_step)
+      rv = Math.floor((idx + 1) * r_step)
+      balloon_input_r($(@)).val(rv)
+  $('.r-reset').map -> 
+    $(@).click -> 
+      wrapper = $(@).parent()
+      balloon_trace = '#panel' + $(wrapper).attr('panel_id') + 'speech_balloon' + $(wrapper).attr('element_id') + 'balloon' + $(wrapper).attr('element_part_id')
+      $(balloon_trace + 'r').val(0)
+  

data/app/views/circle_speech_balloon/balloons/_form.html.erb

@@ -1,3 +1,4 @@
+  <%= javascript_include_tag "circle_speech_balloon/application" %>
 
   <div class="field">
     <%= f.label :x %><br />
@@ -22,6 +23,11 @@
   <div class="field">
     <%= f.label :r %><br />
     <%= f.number_field :r, :id => balloon.field_tag_id(:r), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :r, :tree => balloon.field_tree(:r) %>
+    <div class="r-wrap" panel_id="<%= balloon.tag_panel_id -%>" element_id="<%= balloon.tag_element_id -%>" element_type="<%= balloon.tag_element_type -%>" element_part_id="<%= balloon.tag_element_part_id -%>" element_part_type="<%= balloon.tag_element_part_type -%>" r_step="<%= balloon.r_step -%>">
+      <button class="r-down" value="0"><</button>
+      <button class="r-up" value="0">></button>
+      <button class="r-reset" value="0">reset</button>
+    </div>
   </div>
   
   <%= f.hidden_field :system_picture_id, :id => balloon.field_tag_id(:system_picture_id), :panel_id => balloon.tag_panel_id, :element_id => balloon.tag_element_id, :element_type => balloon.tag_element_type, :element_part_id => balloon.tag_element_part_id, :element_part_type => balloon.tag_element_part_type, :column => :system_picture_id, :tree => balloon.field_tree(:system_picture_id) %>

data/app/views/circle_speech_balloon/speeches/_form.html.erb

@@ -1,7 +1,7 @@
 
   <div class="field">
     <%= f.label :content %><br />
-    <%= f.text_area :content, :id => speech.field_tag_id(:content), :panel_id => speech.tag_panel_id, :element_type => speech.tag_element_type, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :content, :tree => speech.field_tree(:content) %>
+    <%= f.text_area :content, :id => speech.field_tag_id(:content), :panel_id => speech.tag_panel_id, :element_id => speech.tag_element_id, :element_type => speech.tag_element_type, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :content, :tree => speech.field_tree(:content) %>
   </div>
   
   <%= f.hidden_field :x, :id => speech.field_tag_id(:x), :panel_id => speech.tag_panel_id, :element_id => speech.tag_element_id, :element_type => speech.tag_element_type, :element_part_id => speech.tag_element_part_id, :element_part_type => speech.tag_element_part_type, :column => :x, :tree => speech.field_tree(:x) %>

data/lib/circle_speech_balloon/version.rb

@@ -1,3 +1,3 @@
 module CircleSpeechBalloon
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/circle_speech_balloon.rb

@@ -36,13 +36,16 @@ module CircleSpeechBalloon
       self.speech_balloon || @new_speech_balloon
     end
     
+    def parsed_settings 
+      @parsed_settings ||= get_speech_balloon.speech_balloon_template.parsed_settings
+    end
+    
     def supply_default 
-      parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
       self.x = 0
       self.y = 0
-      self.width = parsed_settings['speech_balloon']['default_width']
-      self.height = parsed_settings['speech_balloon']['default_height']
-      self.r = parsed_settings['speech_balloon']['default_r']
+      self.width = self.parsed_settings['speech_balloon']['default_width']
+      self.height = self.parsed_settings['speech_balloon']['default_height']
+      self.r = self.parsed_settings['speech_balloon']['default_r']
     end
     
     def extend_balloon
@@ -54,14 +57,17 @@ module CircleSpeechBalloon
     end
     
     def select_system_picture 
-      parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
       tr = self.r % 360
       tr = 360 - tr if tr < 0
-      br = (tr / parsed_settings['speech_balloon']['r_step']).to_i
-      self.system_picture_id = parsed_settings[br.to_s]['balloon']['system_picture_id']
+      br = (tr / self.r_step).to_i
+      self.system_picture_id = self.parsed_settings[br.to_s]['balloon']['system_picture_id']
       self.system_picture_id
     end
     
+    def r_step
+      @r_step ||= self.parsed_settings['speech_balloon']['r_step']
+    end
+    
   end
   
   module SpeechModule

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circle_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,9 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/assets/javascripts/circle_speech_balloon/application.js
-- app/assets/javascripts/circle_speech_balloon/balloons.js
-- app/assets/javascripts/circle_speech_balloon/speeches.js
-- app/assets/javascripts/circle_speech_balloon/speech_balloons.js
+- app/assets/javascripts/circle_speech_balloon/balloons.js.coffee
 - app/assets/stylesheets/circle_speech_balloon/application.css
 - app/assets/stylesheets/circle_speech_balloon/balloons.css
 - app/assets/stylesheets/circle_speech_balloon/speeches.css

data/app/assets/javascripts/circle_speech_balloon/balloons.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/assets/javascripts/circle_speech_balloon/speech_balloons.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/assets/javascripts/circle_speech_balloon/speeches.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.