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 a934e9c..23e821b 100644 (file)
--- a/app/assets/javascripts/models/speech_balloon.js.coffee
+++ b/app/assets/javascripts/models/speech_balloon.js.coffee
@@ -13,6 +13,9 @@ class Pettanr.SpeechBalloon extends Peta.Element
     t: null\r
   } \r
   \r
+  panel: () ->\r
+    new Pettanr.Panel({id: @get('panel_id')})\r
+  \r
   speech_balloon_template: () ->\r
     new Pettanr.SpeechBalloonTemplate({id: @get('speech_balloon_template_id')})\r
   \r
@@ -21,19 +24,18 @@ class Pettanr.SpeechBalloon extends Peta.Element
   \r
   symbol_option: (cb) ->\r
     sbt = @speech_balloon_template()\r
-    sbt.fetch().done ->\r
+    sbt.fetch({cache: true}).done ->\r
       sp = sbt.system_picture()\r
-      sp.fetch().done ->\r
+      sp.fetch({cache: true}).done ->\r
         cb(sp.tmb_opt_img_tag())\r
   \r
   plain_scenario: () ->\r
     @get('caption')\r
   \r
+  element_face: () ->\r
+    new Pettanr.Views.SpeechBalloon.ElementFace({element: this})\r
+  \r
   initialize: () ->\r
     if @id\r
       @url = @url + @id\r
   \r
-class Pettanr.SpeechBalloon.Collection extends Backbone.Collection\r
-  model: Pettanr.SpeechBalloon\r
-  url: '/speech_balloons/'\r
-  \r