circle_speech_balloon 0.0.36 → 0.0.37

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

@@ -0,0 +1,13 @@
+class PettanrCircleSpeechBalloon
+  WritingFormat = window.PettanrWritingFormat
+  @engine_name = 'circle_speech_balloon'
+  @id = 0
+  @onLoad = () ->
+    PettanrCircleSpeechBalloon.id = window.PettanrSpeechBalloonTemplate.id(PettanrCircleSpeechBalloon.engine_name)
+  
+  @add_helper = (opt) ->
+    RHelper = window.PettanrBalloonRHelper
+    RHelper.add_helper($('.r-wrap'))
+  
+window.PettanrSpeechBalloonTemplate.scripts[PettanrCircleSpeechBalloon.engine_name] = PettanrCircleSpeechBalloon
+@PettanrCircleSpeechBalloon = PettanrCircleSpeechBalloon

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

@@ -2,11 +2,9 @@
   <div class="field">
     <%= f.label :r %>
     <%= f.number_field :r, balloon.field_tag_attributes(:r, no_attr, :size => 5) %>
-    <span class="r-wrap" style="display: none;" <%= raw balloon.tag_attr -%> 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>
-    </span>
+    <% if balloon.has_helper?(:r) %>
+      <%= render balloon.form_helper_template(:r), :elm => balloon, :no_attr => no_attr %>
+    <% end %>
   </div>
   
   <div class="field">

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

@@ -1,46 +1,32 @@
   <div class="field">
-    <%= f.label :writing_format_id %><br />
-    <%= f.collection_select :writing_format_id, WritingFormat.list.map {|l| [l.caption, l.id] }, :last, :first, {:html => {:selected => speech.writing_format_id}}, speech.field_tag_attributes(:writing_format_id, no_attr) %>
+    <%= f.label :writing_format_id %>
+    <%= f.collection_select :writing_format_id, WritingFormat.list.map {|l| [l.caption, l.id] }, *speech.select_tag_attributes(speech.writing_format_id, :writing_format_id, no_attr) %>
+    
+    <%= f.label :font_size %>
+    <%= f.collection_select :font_size, t_select_items(MagicNumber['speech_font_size_items']), *speech.select_tag_attributes(speech.font_size, :font_size, no_attr) %>
   </div>
   
   <div class="field">
-    <%= f.label :content %><br />
-    <%= f.text_area :content, speech.field_tag_attributes(:content, no_attr, :size => '35x7') %>
-  </div>
-  
-  <div class="field">
-    <%= f.label :font_size %><br />
-    <%= f.collection_select :font_size, t_select_items(MagicNumber['speech_font_size_items']), :last, :first, {:html => {:selected => speech.font_size}}, speech.field_tag_attributes(:font_size, no_attr) %>
+    <%= f.label :text_align %>
+    <%= f.collection_select :text_align, t_select_items(MagicNumber['speech_text_align_items']), *speech.select_tag_attributes(speech.text_align, :text_align, no_attr) %>
+    
+    <%= f.label :quotes %>
+    <%= f.text_field :quotes, speech.field_tag_attributes(:quotes, no_attr, :size => 5) %>
   </div>
   
   <div class="field">
-    <%= f.label :text_align %><br />
-    <%= f.collection_select :text_align, t_select_items(MagicNumber['speech_text_align_items']), :last, :first, {:html => {:selected => speech.text_align}}, speech.field_tag_attributes(:text_align, no_attr) %>
+    <%= f.label :content %><br />
+    <%= f.text_area :content, speech.field_tag_attributes(:content, no_attr, :size => ' 45x5') %>
   </div>
   
   <div class="field">
     <%= f.label :fore_color %>
     <%= f.text_field :fore_color, speech.field_tag_attributes(:fore_color, no_attr, :size => 8) %>
-    <div class="colorpicker-wrap">
-      <div class="colorpicker" style="float: left;" <%= raw speech.field_tag_attr(:code_picker, no_attr) -%>>
-        <div id="<%= speech.tag_id(:code_red) -%>" class="colorpicker-red"></div>
-        <div id="<%= speech.tag_id(:code_green) -%>" class="colorpicker-green"></div>
-        <div id="<%= speech.tag_id(:code_blue) -%>" class="colorpicker-blue"></div>
+    <% if speech.has_helper?(:fore_color) %>
+      <div class="speech-fore_color-wrap">
+        <%= render speech.form_helper_template(:fore_color), :elm => speech, :no_attr => no_attr %>
       </div>
-      <div style="float: left;">
-        <div id="<%= speech.tag_id(:code_swatch) -%>" class="ui-widget-content ui-corner-all code_swatch"></div>
-      </div>
-      <div style="float: left;">
-        <div id="<%= speech.tag_id(:code_hex) -%>"></div>
-        <div id="<%= speech.tag_id(:code_rgb) -%>"></div>
-      </div>
-      <div style="clear: both;"></div>
-    </div>
-  </div>
-  
-  <div class="field">
-    <%= f.label :quotes %>
-    <%= f.text_field :quotes, speech.field_tag_attributes(:quotes, no_attr, :size => 5) %>
+    <% end %>
   </div>
   
   <%= f.hidden_field :x, speech.field_tag_attributes(:x, no_attr) %>

data/lib/circle_speech_balloon/version.rb

@@ -1,3 +1,3 @@
 module CircleSpeechBalloon
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circle_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,7 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/assets/javascripts/circle_speech_balloon/application.js
-- app/assets/javascripts/circle_speech_balloon/balloons.js.coffee
+- app/assets/javascripts/circle_speech_balloon/circle_speech_balloon.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.coffee

@@ -1,99 +0,0 @@
-$ ->
-  # 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 = ()  ->
-    circle_speech_balloon_settings['speech_balloon']['r_step']
-  balloon_next_index = (input_r, r_step, d)  ->
-    v = parseInt(input_r.val()) + r_step * d
-    tr = v % 360
-    tr = 360 + tr if tr < 0
-    offset = r_step / 2.0
-    idx = Math.floor(((tr + offset) % 360) / r_step)
-    if idx == 0
-      ir = 0
-    else
-      if v < 0
-        ir = Math.floor(idx * r_step) - 360
-      else
-        ir = Math.floor(idx * r_step)
-    input_r.val(ir)
-    idx
-  balloon_index = (input_r, r_step)  ->
-    v = parseInt(input_r.val())
-    tr = v % 360
-    tr = 360 + tr if tr < 0
-    offset = r_step / 2.0
-    idx = Math.floor(((tr + offset) % 360) / r_step)
-    idx
-  refresh_balloon = (bln, idx)  ->
-    sp_id = circle_speech_balloon_settings[String(idx)]['balloon']['system_picture_id']
-    fn = '/system_pictures/' + String(sp_id) + '.png'
-    ofn = bln.attr('src')
-    if fn == ofn
-    else
-      if bln.attr('src')
-        bln.attr('src', fn) 
-        balloon_trace = '#panel' + $(bln).attr('panel_id') + 'speech_balloon' + $(bln).attr('element_id') + 'balloon' + $(bln).attr('element_part_id')
-        $(balloon_trace + 'system_picture_id').val(sp_id)
-  myform = (input)  ->
-    div_trace = '#panel' + $(input).attr('panel_id') + 'speech_balloon' + $(input).attr('element_id') + 'balloon' + $(input).attr('element_part_id')
-    classname = $(div_trace + 'form').attr('classname')
-    if classname == 'CircleSpeechBalloon'
-      r = true
-    else
-      r = false
-    r
-  
-  $('input').map  ->
-    if $(@).attr('element_type') and $(@).attr('element_type') == 'speech_balloon' and $(@).attr('column') == 'r'
-      if myform($(@))
-        $(@).spinner {
-          spin: ( event, ui ) ->
-            balloon_trace = '#panel' + $(@).attr('panel_id') + 'speech_balloon' + $(@).attr('element_id') + 'balloon' + $(@).attr('element_part_id')
-            r_step = balloon_r_step()
-            idx = balloon_index($(balloon_trace + 'r'), r_step)
-            refresh_balloon($(balloon_trace), idx)
-        }
-
-  $('.r-wrap').map -> 
-    $(@).css('display', 'block')
-    
-  $('.r-down').map -> 
-    $(@).click -> 
-      r_step = balloon_r_step()
-      idx = balloon_next_index(balloon_input_r($(@)), r_step, -1)
-      wrapper = $(@).parent()
-      balloon_trace = '#panel' + $(wrapper).attr('panel_id') + 'speech_balloon' + $(wrapper).attr('element_id') + 'balloon' + $(wrapper).attr('element_part_id')
-      refresh_balloon($(balloon_trace), idx)
-      false
-  $('.r-up').map -> 
-    $(@).click -> 
-      r_step = balloon_r_step()
-      idx = balloon_next_index(balloon_input_r($(@)), r_step, 1)
-      wrapper = $(@).parent()
-      balloon_trace = '#panel' + $(wrapper).attr('panel_id') + 'speech_balloon' + $(wrapper).attr('element_id') + 'balloon' + $(wrapper).attr('element_part_id')
-      refresh_balloon($(balloon_trace), idx)
-      false
-  $('.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_input_r($(@)).val(0)
-      refresh_balloon($(balloon_trace), 0)
-      false
-  
-  # sync view 
-  $('input').map  ->
-    if $(@).attr('element_type') and $(@).attr('element_type') == 'speech_balloon'
-      if myform($(@))
-        $(@).focusout ->
-          switch $(@).attr('column')
-            when 'r'
-              balloon_trace = '#panel' + $(@).attr('panel_id') + 'speech_balloon' + $(@).attr('element_id') + 'balloon' + $(@).attr('element_part_id')
-              r_step = balloon_r_step()
-              idx = balloon_index($(balloon_trace + 'r'), r_step)
-              refresh_balloon($(balloon_trace), idx)