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

[pettanr/pettanr.git] / app / assets / javascripts / models / speech_balloon.js.coffee

diff --git a/app/assets/javascripts/models/speech_balloon.js.coffee b/app/assets/javascripts/models/speech_balloon.js.coffee
index 23e821b..d5e5280 100644 (file)
--- a/app/assets/javascripts/models/speech_balloon.js.coffee
+++ b/app/assets/javascripts/models/speech_balloon.js.coffee
@@ -13,8 +13,8 @@ class Pettanr.SpeechBalloon extends Peta.Element
     t: null\r
   } \r
   \r
-  panel: () ->\r
-    new Pettanr.Panel({id: @get('panel_id')})\r
+  panel: (options = {}) ->\r
+    new Pettanr.Panel({id: @get('panel_id')}, options)\r
   \r
   speech_balloon_template: () ->\r
     new Pettanr.SpeechBalloonTemplate({id: @get('speech_balloon_template_id')})\r
@@ -22,12 +22,17 @@ class Pettanr.SpeechBalloon extends Peta.Element
   @has_picture: () ->\r
     false\r
   \r
-  symbol_option: (cb) ->\r
+  symbol_option: () ->\r
     sbt = @speech_balloon_template()\r
-    sbt.fetch({cache: true}).done ->\r
+    sbt.fetch({cache: true}).done =>\r
       sp = sbt.system_picture()\r
-      sp.fetch({cache: true}).done ->\r
-        cb(sp.tmb_opt_img_tag())\r
+      sp.fetch({cache: true}).done =>\r
+        @trigger('ready:symbol', sp.tmb_opt_img_tag())\r
+  \r
+  filer_caption: () ->\r
+    @fetch({cache: true}).done =>\r
+      caption = @escape('caption')\r
+      @trigger('ready:caption', caption)\r
   \r
   plain_scenario: () ->\r
     @get('caption')\r