X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fassets%2Fjavascripts%2Faddons%2Fsquare_speech_balloons%2Finit.js.coffee;h=07669f6368b15c8ed5ddacb4d8aacff65523b00d;hb=7cc9010daab46f2f6ae0b0314904ad9704022e7f;hp=2fd53659b89589bb7ea859eaf39a76317f4da9e5;hpb=e4faa10efb5330dde4c13345677b2fff49c4df3f;p=pettanr%2Fpettanr.git

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 2fd53659..07669f63 100644
--- 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'
 
 class Pettanr.SquareSpeechBalloon.SpeechBalloonModule
-  supply_default: () ->
-    super()
-    sbt = @speech_balloon_template()
-    sbt.fetch({cache: true}).done =>
-      @speech_balloon_template_module_name = sbt.get('module_name')
+  supply_default: (templates) ->
+    @templates = templates
   
   speech_balloon_extend: () ->
     @new_speech_balloon() if not @sbex
@@ -102,9 +99,8 @@ class Pettanr.SquareSpeechBalloon.SpeechBalloonModule
     @sbex.supply_default()
   
 class Pettanr.SquareSpeechBalloon.BalloonModule
-  supply_default: () ->
-    super()
-    s = @parsed_settings()['all']['balloon']
+  supply_default: (templates) ->
+    @templates = templates
     @set({
       x: 0,
       y: 0,
@@ -112,6 +108,7 @@ class Pettanr.SquareSpeechBalloon.BalloonModule
       eight: @parsed_settings()['speech_balloon']['default_height'],
       r: 0
     })
+    @select_system_picture()
   
   balloon_extend: () ->
     @new_balloon() if not @bex
@@ -128,9 +125,7 @@ class Pettanr.SquareSpeechBalloon.BalloonModule
   
   parsed_settings: () ->
     return @parsed if @parsed
-    sbt = @speech_balloon_template()
-    sbt.fetch({cache: true}).done =>
-      @parsed = sbt.parsed_settings()
+    @parsed = @templates.speech_balloon_template.parsed_settings()
   
   select_system_picture: () ->
     s = @parsed_settings()['all']['balloon']
@@ -139,8 +134,8 @@ class Pettanr.SquareSpeechBalloon.BalloonModule
     sid
   
 class Pettanr.SquareSpeechBalloon.SpeechModule
-  supply_default: () ->
-    super()
+  supply_default: (templates) ->
+    @templates = templates
     s = @parsed_settings()['all']['speech']
     @set({
       x: s['x_rate'],
@@ -167,9 +162,7 @@ class Pettanr.SquareSpeechBalloon.SpeechModule
   
   parsed_settings: () ->
     return @parsed if @parsed
-    sbt = @speech_balloon_template()
-    sbt.fetch({cache: true}).done =>
-      @parsed = sbt.parsed_settings()
+    @parsed = @templates.speech_balloon_template.parsed_settings()
   
   arrayed_quotes: () ->
     q = if Pettanr.is_blank(@get('quotes'))