circle_speech_balloon 0.0.24 → 0.0.25

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

@@ -1,34 +1,34 @@
 <%= form_for(speech_balloon) do |f| %>
   <%= render 'system/error_explanation', :obj => speech_balloon %>
-  <%= render 'system/error_explanation', :obj => speech_balloon_extend %>
-  <%= render 'system/error_explanation', :obj => balloon_extend %>
-  <%= render 'system/error_explanation', :obj => speech_extend %>
+  <%= render 'system/error_explanation', :obj => speech_balloon.extend_speech_balloon %>
+  <%= render 'system/error_explanation', :obj => speech_balloon.get_balloon.extend_balloon %>
+  <%= render 'system/error_explanation', :obj => speech_balloon.get_speech.extend_speech %>
 
   <div class="field">
     <%= f.label :caption %>
-    <%= f.number_field :caption, :id => speech_balloon.field_tag_id(:caption), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :caption, :new_index => speech_balloon.new_index, :no_attr => no_attr %>
+    <%= f.number_field :caption, :id => speech_balloon.field_tag_id(:caption), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :caption, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
   </div>
   <%= f.fields_for(:speech) do |sf| %>
-    <%= render speech_balloon.speech_balloon_template.engine_name + '/speeches/form', :f => sf, :speech => speech_balloon.speech, :no_attr => no_attr %>
+    <%= render speech_balloon.speech_balloon_template.engine_name + '/speeches/form', :f => sf, :speech => speech_balloon.get_speech, :no_attr => no_attr %>
   <% end %>
 
   <%= f.fields_for(:balloon) do |bf| %>
-    <%= render speech_balloon.speech_balloon_template.engine_name + '/balloons/form', :f => bf, :balloon => speech_balloon.balloon, :no_attr => no_attr %>
+    <%= render speech_balloon.speech_balloon_template.engine_name + '/balloons/form', :f => bf, :balloon => speech_balloon.get_balloon, :no_attr => no_attr %>
   <% end %>
 
   <div class="field">
     <%= f.label :z %>
-    <%= f.number_field :z, :size => 5, :id => speech_balloon.field_tag_id(:z), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :z, :new_index => speech_balloon.new_index, :no_attr => no_attr %>
+    <%= f.number_field :z, :size => 5, :id => speech_balloon.field_tag_id(:z), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :z, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
 
     <%= f.label :t %>
-    <%= f.number_field :t, :size => 5, :id => speech_balloon.field_tag_id(:t), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :t, :new_index => speech_balloon.new_index, :no_attr => no_attr %>
+    <%= f.number_field :t, :size => 5, :id => speech_balloon.field_tag_id(:t), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :t, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
   </div>
   
-  <%= f.hidden_field :panel_id, :id => speech_balloon.field_tag_id(:panel_id), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :panel_id, :new_index => speech_balloon.new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :classname, :id => speech_balloon.field_tag_id(:classname), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :classname, :new_index => speech_balloon.new_index, :no_attr => no_attr %>
-  <%= f.hidden_field :speech_balloon_template_id, :id => speech_balloon.field_tag_id(:speech_balloon_template_id), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :speech_balloon_template_id, :new_index => speech_balloon.new_index, :no_attr => no_attr %>
+  <%= f.hidden_field :panel_id, :id => speech_balloon.field_tag_id(:panel_id), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :panel_id, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
+  <%= f.hidden_field :classname, :id => speech_balloon.field_tag_id(:classname), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :classname, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
+  <%= f.hidden_field :speech_balloon_template_id, :id => speech_balloon.field_tag_id(:speech_balloon_template_id), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :speech_balloon_template_id, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
   <% unless speech_balloon.new_record?  %>
-    <%= f.hidden_field :id, :id => speech_balloon.field_tag_id(:id), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :id, :new_index => speech_balloon.new_index, :no_attr => no_attr %>
+    <%= f.hidden_field :id, :id => speech_balloon.field_tag_id(:id), :panel_id => speech_balloon.tag_panel_id, :element_id => speech_balloon.tag_element_id, :element_type => speech_balloon.tag_element_type, :column => :id, :new_index => speech_balloon.tag_new_index, :no_attr => no_attr %>
   <% end %>
 
   <div class="actions">

data/app/views/circle_speech_balloon/speech_balloons/edit.html.erb

@@ -4,4 +4,4 @@
 <h2><%= t('home.index.catch') -%></h2>
 <%= render 'panels/standard', :panel => @panel, :author => @author %>
 <h2><%= t('speech_balloons.update_speech_balloon') -%></h2>
-<%= render @speech_balloon.speech_balloon_template.engine_name + '/speech_balloons/form', :speech_balloon => @speech_balloon, :balloon => @balloon, :speech => @speech, :speech_balloon_extend => @speech_balloon_extend, :balloon_extend => @balloon_extend, :speech_extend => @speech_extend %>
+<%= render @speech_balloon.speech_balloon_template.engine_name + '/speech_balloons/form', :speech_balloon => @speech_balloon, :no_attr => 0 %>

data/app/views/circle_speech_balloon/speech_balloons/new.html.erb

@@ -4,4 +4,4 @@
 <h2><%= t('home.index.catch') -%></h2>
 <%= render 'panels/standard', :panel => @panel, :author => @author %>
 <h2><%= t('speech_balloons.create_speech_balloon') -%></h2>
-<%= render @speech_balloon.speech_balloon_template.engine_name + '/speech_balloons/form', :speech_balloon => @speech_balloon, :balloon => @balloon, :speech => @speech, :speech_balloon_extend => @speech_balloon_extend, :balloon_extend => @balloon_extend, :speech_extend => @speech_extend %>
+<%= render @speech_balloon.speech_balloon_template.engine_name + '/speech_balloons/form', :speech_balloon => @speech_balloon, :no_attr => 0 %>

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

@@ -5,7 +5,7 @@
   
   <div class="field">
     <%= f.label :content %><br />
-    <%= f.text_area :content, :size => '20x7', :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, :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 %>
   </div>
   
   <div class="field">

data/lib/circle_speech_balloon/version.rb

@@ -1,3 +1,3 @@
 module CircleSpeechBalloon
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/lib/circle_speech_balloon.rb

@@ -24,17 +24,6 @@ module CircleSpeechBalloon
   end
   
   module BalloonModule
-    def new_speech_balloon
-      @new_speech_balloon
-    end
-    
-    def new_speech_balloon= v
-      @new_speech_balloon = v
-    end
-    
-    def get_speech_balloon
-      self.speech_balloon || @new_speech_balloon
-    end
     
     def parsed_settings 
       @parsed_settings ||= get_speech_balloon.speech_balloon_template.parsed_settings
@@ -76,17 +65,6 @@ module CircleSpeechBalloon
   end
   
   module SpeechModule
-    def new_speech_balloon
-      @new_speech_balloon
-    end
-    
-    def new_speech_balloon= v
-      @new_speech_balloon = v
-    end
-    
-    def get_speech_balloon
-      self.speech_balloon || @new_speech_balloon
-    end
     
     def parsed_settings 
       @parsed_settings ||= get_speech_balloon.speech_balloon_template.parsed_settings

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circle_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails