square_speech_balloon 0.0.35 → 0.0.36

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

@@ -1,27 +1,27 @@
 <div id="<%= balloon.field_tag_id(:form) %>" classname="<%= balloon.classname %>">
 
-  <%= f.hidden_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, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
+  <%= f.hidden_field :r, balloon.field_tag_attributes(:r, no_attr, :size => 5) %>
   
   <div class="field">
     <%= f.label :x %>
-    <%= f.number_field :x, :size => 5, :id => balloon.field_tag_id(:x), :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 => :x, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
+    <%= f.number_field :x, balloon.field_tag_attributes(:x, no_attr, :size => 5) %>
 
     <%= f.label :y %>
-    <%= f.number_field :y, :size => 5, :id => balloon.field_tag_id(:y), :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 => :y, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
+    <%= f.number_field :y, balloon.field_tag_attributes(:y, no_attr, :size => 5) %>
   </div>
 
   <div class="field">
     <%= f.label :width %>
-    <%= f.number_field :width, :size => 5, :id => balloon.field_tag_id(:width), :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 => :width, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
+    <%= f.number_field :width, balloon.field_tag_attributes(:width, no_attr, :size => 5) %>
 
     <%= f.label :height %>
-    <%= f.number_field :height, :size => 5, :id => balloon.field_tag_id(:height), :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 => :height, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
+    <%= f.number_field :height, balloon.field_tag_attributes(:height, no_attr, :size => 5) %>
   </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, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :settings, :id => balloon.field_tag_id(:settings), :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 => :settings, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :speech_balloon_id, :id => balloon.field_tag_id(:speech_balloon_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 => :speech_balloon_id, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
+  <%= f.hidden_field :system_picture_id, balloon.field_tag_attributes(:system_picture_id, no_attr) %>
+  <%= f.hidden_field :settings, balloon.field_tag_attributes(:settings, no_attr) %>
+  <%= f.hidden_field :speech_balloon_id, balloon.field_tag_attributes(:speech_balloon_id, no_attr) %>
   <% unless balloon.new_record?  %>
-    <%= f.hidden_field :id, :id => balloon.field_tag_id(: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 => :id, :new_index => balloon.tag_new_index, :no_attr => no_attr %>
+    <%= f.hidden_field :id, balloon.field_tag_attributes(:id, no_attr) %>
   <% end %>
 </div>

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

@@ -1,12 +1,12 @@
 <%= form_for(elm) do |f| %>
   <%= render 'system/error_explanation', :obj => elm %>
   <%= render 'system/error_explanation', :obj => elm.extend_speech_balloon %>
-  <%= render 'system/error_explanation', :obj => elm.get_balloon.extend_balloon %>
-  <%= render 'system/error_explanation', :obj => elm.get_speech.extend_speech %>
+  <%= render 'system/error_explanation', :obj => elm.balloon.extend_balloon %>
+  <%= render 'system/error_explanation', :obj => elm.speech.extend_speech %>
 
   <div class="field">
     <%= f.label :caption %>
-    <%= f.number_field :caption, :id => elm.field_tag_id(:caption), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :caption, :new_index => elm.new_index, :no_attr => no_attr %>
+    <%= f.number_field :caption, elm.field_tag_attributes(:caption, no_attr) %>
   </div>
   <%= f.fields_for(:speech) do |sf| %>
     <%= render elm.speech_form_template, :f => sf, :speech => elm.get_speech, :no_attr => no_attr %>
@@ -18,17 +18,17 @@
 
   <div class="field">
     <%= f.label :z %>
-    <%= f.number_field :z, :size => 5, :id => elm.field_tag_id(:z), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :z, :new_index => elm.new_index, :no_attr => no_attr %>
+    <%= f.number_field :z, elm.field_tag_attributes(:z, no_attr, :size => 5) %>
 
     <%= f.label :t %><br />
-    <%= f.number_field :t, :size => 5, :id => elm.field_tag_id(:t), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :t, :new_index => elm.new_index, :no_attr => no_attr %>
+    <%= f.number_field :t, elm.field_tag_attributes(:t, no_attr, :size => 5) %>
   </div>
   
-  <%= f.hidden_field :panel_id, :id => elm.field_tag_id(:panel_id), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :panel_id, :new_index => elm.new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :classname, :id => elm.field_tag_id(:classname), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :classname, :new_index => elm.new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :speech_balloon_template_id, :id => elm.field_tag_id(:speech_balloon_template_id), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :speech_balloon_template_id, :new_index => elm.new_index, :no_attr => no_attr %>
+  <%= f.hidden_field :panel_id, elm.field_tag_attributes(:panel_id, no_attr) %>
+  <%= f.hidden_field :classname, elm.field_tag_attributes(:classname, no_attr) %>
+  <%= f.hidden_field :speech_balloon_template_id, elm.field_tag_attributes(:speech_balloon_template_id, no_attr) %>
   <% unless elm.new_record?  %>
-    <%= f.hidden_field :id, :id => elm.field_tag_id(:id), :panel_id => elm.tag_panel_id, :element_id => elm.tag_element_id, :element_type => elm.tag_element_type, :column => :id, :new_index => elm.new_index, :no_attr => no_attr %>
+    <%= f.hidden_field :id, elm.field_tag_attributes(:id, no_attr) %>
   <% end %>
 
   <div class="actions">

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

@@ -1,28 +1,28 @@
   <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}}, {:id => speech.field_tag_id(:writing_format_id), :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 => :writing_format_id, :new_index => speech.tag_new_index, :no_attr => no_attr} %>
+    <%= 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) %>
   </div>
   
   <div class="field">
     <%= f.label :content %><br />
-    <%= f.text_area :content, :size => '35x7', :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, :new_index => speech.tag_new_index, :no_attr => no_attr %>
+    <%= 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}}, {:id => speech.field_tag_id(:font_size), :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 => :font_size, :new_index => speech.tag_new_index, :no_attr => no_attr} %>
+    <%= 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 :text_align %><br />
-    <%= f.collection_select :text_align, t_select_items(MagicNumber['speech_text_align_items']), :last, :first, {:html => {:selected => speech.text_align}}, {:id => speech.field_tag_id(:text_align), :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 => :text_align, :new_index => speech.tag_new_index, :no_attr => no_attr} %>
+    <%= 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) %>
   </div>
   
   <div class="field">
     <%= f.label :fore_color %>
-    <%= f.text_field :fore_color, :size => 8, :id => speech.tag_id(:fore_color), :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 => :fore_color, :new_index => speech.tag_new_index, :no_attr => no_attr %>
+    <%= 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;" id="<%= speech.tag_id(:code_picker) -%>" 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 -%>">
+      <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>
@@ -40,16 +40,16 @@
   
   <div class="field">
     <%= f.label :quotes %>
-    <%= f.text_field :quotes, :size => 5, :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, :new_index => speech.tag_new_index, :no_attr => no_attr %>
+    <%= f.text_field :quotes, speech.field_tag_attributes(:quotes, no_attr, :size => 5) %>
   </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, :new_index => speech.tag_new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :y, :id => speech.field_tag_id(:y), :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 => :y, :new_index => speech.tag_new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :width, :id => speech.field_tag_id(:width), :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 => :width, :new_index => speech.tag_new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :height, :id => speech.field_tag_id(:height), :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 => :height, :new_index => speech.tag_new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :settings, :id => speech.field_tag_id(:settings), :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 => :settings, :new_index => speech.tag_new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :speech_balloon_id, :id => speech.field_tag_id(:speech_balloon_id), :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 => :speech_balloon_id, :new_index => speech.tag_new_index, :no_attr => no_attr %>
+  <%= f.hidden_field :x, speech.field_tag_attributes(:x, no_attr) %>
+  <%= f.hidden_field :y, speech.field_tag_attributes(:y, no_attr) %>
+  <%= f.hidden_field :width, speech.field_tag_attributes(:width, no_attr) %>
+  <%= f.hidden_field :height, speech.field_tag_attributes(:height, no_attr) %>
+  <%= f.hidden_field :settings, speech.field_tag_attributes(:settings, no_attr) %>
+  <%= f.hidden_field :speech_balloon_id, speech.field_tag_attributes(:speech_balloon_id, no_attr) %>
   
   <% unless speech.new_record?  %>
-    <%= f.hidden_field :id, :id => speech.field_tag_id(:id), :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 => :id, :new_index => speech.tag_new_index, :no_attr => no_attr %>
+    <%= f.hidden_field :id, speech.field_tag_attributes(:id, no_attr) %>
   <% end %>

data/lib/square_speech_balloon/version.rb

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

data/lib/square_speech_balloon.rb

@@ -26,7 +26,7 @@ module SquareSpeechBalloon
   module BalloonModule
     
     def parsed_settings 
-      @parsed_settings ||= get_speech_balloon.speech_balloon_template.parsed_settings
+      @parsed_settings ||= get_parent.speech_balloon_template.parsed_settings
     end
     
     def supply_default 
@@ -53,7 +53,7 @@ module SquareSpeechBalloon
     end
     
     def classname
-      get_speech_balloon.speech_balloon_template.classname
+      get_parent.speech_balloon_template.classname
     end
     
   end
@@ -61,7 +61,7 @@ module SquareSpeechBalloon
   module SpeechModule
     
     def parsed_settings 
-      @parsed_settings ||= get_speech_balloon.speech_balloon_template.parsed_settings
+      @parsed_settings ||= get_parent.speech_balloon_template.parsed_settings
     end
     
     def supply_default 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: square_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails