fix:balloon r

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

diff --git a/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee b/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee
index 1110032..f9d16c8 100644 (file)
--- a/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee
+++ b/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee
@@ -82,8 +82,7 @@ class Pettanr.CircleSpeechBalloon.Speech extends Backbone.Model
     @engine_name() + '/speeches'\r
 \r
 class Pettanr.CircleSpeechBalloon.SpeechBalloonModule\r
-  supply_default: (templates) ->\r
-    @templates = templates\r
+  supply_default: () ->\r
   \r
   speech_balloon_extend: () ->\r
     @new_speech_balloon() if not @sbex\r
@@ -99,31 +98,16 @@ class Pettanr.CircleSpeechBalloon.SpeechBalloonModule
     @sbex.supply_default()\r
   \r
 class Pettanr.CircleSpeechBalloon.BalloonModule\r
-  supply_default: (templates) ->\r
-    @templates = templates\r
+  supply_default: () ->\r
     @set({\r
       x: 0,\r
       y: 0,\r
       width: @parsed_settings()['speech_balloon']['default_width'],\r
-      eight: @parsed_settings()['speech_balloon']['default_height'],\r
+      height: @parsed_settings()['speech_balloon']['default_height'],\r
       r: @parsed_settings()['speech_balloon']['default_r']\r
     })\r
     @select_system_picture()\r
   \r
-  hoge_templates: () ->\r
-    if !@templates.speech_balloon_template\r
-      empty_item = new Pettanr.SpeechBalloonTemplate({id: @get('speech_balloon_template_id')})\r
-      item = Pettanr.cache.restore(empty_item)\r
-      if item\r
-        # got cached item\r
-        @templates.speech_balloon_template = item\r
-      else\r
-        # built empty item\r
-        item = empty_item\r
-        item.fetch().done =>\r
-          Pettanr.cache.store(item)\r
-        @templates.speech_balloon_template = item\r
-  \r
   balloon_extend: () ->\r
     @new_balloon() if not @bex\r
     @bex\r
@@ -163,15 +147,14 @@ class Pettanr.CircleSpeechBalloon.BalloonModule
     Math.floor(((round_r + offset) % 360) / @r_step())\r
   \r
 class Pettanr.CircleSpeechBalloon.SpeechModule\r
-  supply_default: (templates) ->\r
-    @templates = templates\r
+  supply_default: () ->\r
     s = @parsed_settings()['0']['speech']\r
     @set({\r
       x: s['x_rate'],\r
       y: s['y_rate'],\r
       width: s['width_rate'],\r
       height: s['height_rate'],\r
-      quotes: '',\r
+      quotes: @parsed_settings()['speech_balloon']['quotes'],\r
       font_size: @parsed_settings()['speech_balloon']['default_font_size'],\r
       text_align: @parsed_settings()['speech_balloon']['default_text_align'],\r
       fore_color: @parsed_settings()['speech_balloon']['default_fore_color'],\r