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

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

diff --git a/app/assets/javascripts/models/speech.js.coffee b/app/assets/javascripts/models/speech.js.coffee
index cd11afd..9914732 100644 (file)
--- a/app/assets/javascripts/models/speech.js.coffee
+++ b/app/assets/javascripts/models/speech.js.coffee
@@ -23,20 +23,20 @@ class Pettanr.Speech extends Peta.Element
   \r
   symbol_option: (cb) ->\r
     sb = @speech_balloon()\r
-    sb.fetch().done ->\r
+    sb.fetch({cache: true}).done =>\r
       sbt = sb.speech_balloon_template()\r
-      sbt.fetch().done ->\r
+      sbt.fetch({cache: true}).done =>\r
         sp = sbt.system_picture()\r
-        sp.fetch().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
   text_align_text: () ->\r
     Pettanr.Speech.text_align_texts()[@get('text_align')]\r
   \r
   scenario: () ->\r
     @boosts('read')\r
-    #@render()  using wf renderer\r
-    @get('content')\r
+    @render(@escape('content'))\r
+    \r
   \r
   initialize: () ->\r
     if @id\r