Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / assets / javascripts / models / speech_balloon_template.js.coffee

diff --git a/app/assets/javascripts/models/speech_balloon_template.js.coffee b/app/assets/javascripts/models/speech_balloon_template.js.coffee
index 32759bf..f802146 100644 (file)
--- a/app/assets/javascripts/models/speech_balloon_template.js.coffee
+++ b/app/assets/javascripts/models/speech_balloon_template.js.coffee
@@ -16,7 +16,7 @@ class Pettanr.SpeechBalloonTemplate extends Peta.Template
   \r
   symbol_option: (cb) ->\r
     i = @system_picture()\r
-    i.fetch().done ->\r
+    i.fetch({cache: true}).done ->\r
       cb(i.tmb_opt_img_tag())\r
   \r
   parsed_settings: () ->\r
@@ -26,6 +26,3 @@ class Pettanr.SpeechBalloonTemplate extends Peta.Template
     if @id\r
       @url = @url + @id\r
     \r
-class Pettanr.SpeechBalloonTemplate.Collection extends Backbone.Collection\r
-  model: Pettanr.SpeechBalloonTemplate\r
-  url: '/speech_balloon_templates'\r