From 72398150b032d95c488236e511f1c310a47a5196 Mon Sep 17 00:00:00 2001
From: yasushiito <yas@pen-chan.jp>
Date: Wed, 16 Apr 2014 08:19:14 +0900
Subject: [PATCH] test speech balloon extended

---
 .../javascripts/manifest/work/items.js.coffee.erb  |  6 ---
 .../manifest/work/profilers.js.coffee.erb          | 45 ++++++++++++++++++++++
 app/models/speech_balloon_template.rb              |  4 ++
 lib/peta/element.rb                                |  7 +++-
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/manifest/work/items.js.coffee.erb b/app/assets/javascripts/manifest/work/items.js.coffee.erb
index f5767c53..2f99bda4 100644
--- a/app/assets/javascripts/manifest/work/items.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/items.js.coffee.erb
@@ -55,8 +55,6 @@
       parent_model_name: 'panel',
       boost: {
         speech_balloon_template: {
-          setter_method_name: 'extend_speech_balloon=',
-          getter_method_name: 'extend_speech_balloon',
         },
       },
     },
@@ -67,8 +65,6 @@
       parent_model_name: 'speech_balloon',
       boost: {
         speech_balloon_template: {
-          setter_method_name: 'extend_balloon=',
-          getter_method_name: 'extend_balloon',
         },
       },
     },
@@ -81,8 +77,6 @@
         writing_format: {
         },
         speech_balloon_template: {
-          setter_method_name: 'extend_speech=',
-          getter_method_name: 'extend_speech',
         },
       },
     },
diff --git a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
index bc7a57e0..25e1033e 100644
--- a/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
+++ b/app/assets/javascripts/manifest/work/profilers.js.coffee.erb
@@ -383,12 +383,57 @@
         column_names: [
         ],
       },
+      plain_speech_balloon_balloon: {
+        columns: {
+        },
+        column_names: [
+        ],
+      },
+      plain_speech_balloon_speech: {
+        columns: {
+        },
+        column_names: [
+        ],
+      },
       square_speech_balloon_speech_balloon: {
         columns: {
         },
         column_names: [
         ],
       },
+      square_speech_balloon_balloon: {
+        columns: {
+        },
+        column_names: [
+        ],
+      },
+      square_speech_balloon_speech: {
+        columns: {
+        },
+        column_names: [
+        ],
+      },
+      test_speech_balloon_speech_balloon: {
+        columns: {
+        },
+        column_names: [
+          'a', 
+        ],
+      },
+      test_speech_balloon_balloon: {
+        columns: {
+        },
+        column_names: [
+          'b', 
+        ],
+      },
+      test_speech_balloon_speech: {
+        columns: {
+        },
+        column_names: [
+          'c', 
+        ],
+      },
     }, 
     associations: {
       belongs_to: [
diff --git a/app/models/speech_balloon_template.rb b/app/models/speech_balloon_template.rb
index 09e35004..3e8b44f4 100644
--- a/app/models/speech_balloon_template.rb
+++ b/app/models/speech_balloon_template.rb
@@ -38,6 +38,10 @@ class SpeechBalloonTemplate < Peta::SystemResource
     {}
   end
   
+  def parsed_settings
+    @parsed_settings ||= JSON.parse(self.settings)
+  end
+  
   def self.store name, attr
     #settingsにはHashデータが丸っと文字列化されて入る
     r = SpeechBalloonTemplate.replace_system_picture(attr || {})
diff --git a/lib/peta/element.rb b/lib/peta/element.rb
index 6a692293..f1ed101e 100644
--- a/lib/peta/element.rb
+++ b/lib/peta/element.rb
@@ -33,7 +33,12 @@ module Peta
     # Instance Methods
     
     def root
-      self.__send__ self.class.root_model.item_name
+      pm = self.__send__ self.class.parent_model.item_name
+      if pm.class.element?
+        pm.root
+      else
+        pm
+      end
     end
     
     def visible? operators
-- 
2.11.0