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 5f8a8a4..366cd09 100644 (file)
--- a/app/assets/javascripts/models/speech.js.coffee
+++ b/app/assets/javascripts/models/speech.js.coffee
@@ -15,17 +15,15 @@ class Pettanr.Speech extends Peta.Element
     height: 100\r
   } \r
   \r
-  pick: (templates) ->\r
+  pick: () ->\r
     # \r
-    speech_balloon_template = templates.speech_balloon_template\r
-    writing_format = templates.writing_format\r
+    speech_balloon_template = @templates.speech_balloon_template\r
+    writing_format = @templates.writing_format\r
     {\r
       speech_balloon_template_id: speech_balloon_template.get('id'),\r
       speech_balloon_template_module_name: speech_balloon_template.get('module_name'),\r
-      speech_balloon_template_settings: speech_balloon_template.get('settings')\r
       writing_format_id: writing_format.get('id'),\r
       writing_format_module_name: writing_format.get('module_name'),\r
-      writing_format_template_settings: writing_format.get('settings')\r
     }\r
   \r
   speech_balloon: () ->\r