square_speech_balloon 0.0.36 → 0.0.37

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

@@ -0,0 +1,11 @@
+class PettanrSquareSpeechBalloon
+  WritingFormat = window.PettanrWritingFormat
+  @engine_name = 'square_speech_balloon'
+  @id = 0
+  @onLoad = () ->
+    PettanrSquareSpeechBalloon.id = window.PettanrSpeechBalloonTemplate.id(PettanrSquareSpeechBalloon.engine_name)
+  
+  @add_helper = (opt) ->
+  
+window.PettanrSpeechBalloonTemplate.scripts[PettanrPlainSpeechBalloon.engine_name] = PettanrSquareSpeechBalloon
+@PettanrSquareSpeechBalloon = PettanrSquareSpeechBalloon

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

@@ -1,46 +1,32 @@
   <div class="field">
-    <%= f.label :writing_format_id %><br />
+    <%= f.label :writing_format_id %>
     <%= 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 :font_size %>
+    <%= 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) %>
   </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']), :last, :first, {:html => {:selected => speech.text_align}}, speech.field_tag_attributes(: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 => '35x7') %>
   </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>
-      </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>
+    <% 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="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/square_speech_balloon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: square_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-23 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -51,7 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - app/assets/javascripts/square_speech_balloon/application.js
-- app/assets/javascripts/square_speech_balloon/balloons.js.coffee
+- app/assets/javascripts/square_speech_balloon/square_speech_balloon.js.coffee
 - app/assets/stylesheets/square_speech_balloon/application.css
 - app/assets/stylesheets/square_speech_balloon/balloons.css
 - app/assets/stylesheets/square_speech_balloon/speeches.css

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

@@ -1 +0,0 @@
-$ ->