fix: new speechballoon

[pettanr/pettanr.git] / app / assets / javascripts / addons / square_speech_balloons / init.js.coffee

diff --git a/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee b/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee
index 2fd5365..07669f6 100644 (file)
--- a/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee
+++ b/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee
@@ -82,11 +82,8 @@ class Pettanr.SquareSpeechBalloon.Speech extends Backbone.Model
     @engine_name() + '/speeches'\r
 \r
 class Pettanr.SquareSpeechBalloon.SpeechBalloonModule\r
-  supply_default: () ->\r
-    super()\r
-    sbt = @speech_balloon_template()\r
-    sbt.fetch({cache: true}).done =>\r
-      @speech_balloon_template_module_name = sbt.get('module_name')\r
+  supply_default: (templates) ->\r
+    @templates = templates\r
   \r
   speech_balloon_extend: () ->\r
     @new_speech_balloon() if not @sbex\r
@@ -102,9 +99,8 @@ class Pettanr.SquareSpeechBalloon.SpeechBalloonModule
     @sbex.supply_default()\r
   \r
 class Pettanr.SquareSpeechBalloon.BalloonModule\r
-  supply_default: () ->\r
-    super()\r
-    s = @parsed_settings()['all']['balloon']\r
+  supply_default: (templates) ->\r
+    @templates = templates\r
     @set({\r
       x: 0,\r
       y: 0,\r
@@ -112,6 +108,7 @@ class Pettanr.SquareSpeechBalloon.BalloonModule
       eight: @parsed_settings()['speech_balloon']['default_height'],\r
       r: 0\r
     })\r
+    @select_system_picture()\r
   \r
   balloon_extend: () ->\r
     @new_balloon() if not @bex\r
@@ -128,9 +125,7 @@ class Pettanr.SquareSpeechBalloon.BalloonModule
   \r
   parsed_settings: () ->\r
     return @parsed if @parsed\r
-    sbt = @speech_balloon_template()\r
-    sbt.fetch({cache: true}).done =>\r
-      @parsed = sbt.parsed_settings()\r
+    @parsed = @templates.speech_balloon_template.parsed_settings()\r
   \r
   select_system_picture: () ->\r
     s = @parsed_settings()['all']['balloon']\r
@@ -139,8 +134,8 @@ class Pettanr.SquareSpeechBalloon.BalloonModule
     sid\r
   \r
 class Pettanr.SquareSpeechBalloon.SpeechModule\r
-  supply_default: () ->\r
-    super()\r
+  supply_default: (templates) ->\r
+    @templates = templates\r
     s = @parsed_settings()['all']['speech']\r
     @set({\r
       x: s['x_rate'],\r
@@ -167,9 +162,7 @@ class Pettanr.SquareSpeechBalloon.SpeechModule
   \r
   parsed_settings: () ->\r
     return @parsed if @parsed\r
-    sbt = @speech_balloon_template()\r
-    sbt.fetch({cache: true}).done =>\r
-      @parsed = sbt.parsed_settings()\r
+    @parsed = @templates.speech_balloon_template.parsed_settings()\r
   \r
   arrayed_quotes: () ->\r
     q = if Pettanr.is_blank(@get('quotes'))\r