Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / models / speech.rb

diff --git a/app/models/speech.rb b/app/models/speech.rb
index efe2ab7..b780aa7 100644 (file)
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -35,7 +35,7 @@ class Speech < Peta::Element
   
   def outer_style
     {
-      'top' => self.y, 'left' => self.x, 
+      'top' => self._y, 'left' => self.x, 
       'width' => self.width, 'height' => self.height
     }
   end
@@ -70,15 +70,6 @@ class Speech < Peta::Element
     {:include => {:speech_balloon => {:panel => {:author => {}}, :balloon => {}, :speech_balloon_template => {} }}}
   end
   
-  def copy_attributes
-    r = self.attributes
-    r.delete 'id'
-    r.delete 'speech_balloon_id'
-    r.delete 'created_at'
-    r.delete 'updated_at'
-    r
-  end
-  
   def self.panelize speech_attributes
     {'speech_attributes' => speech_attributes}
   end