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

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

diff --git a/app/assets/javascripts/models/system_picture.js.coffee b/app/assets/javascripts/models/system_picture.js.coffee
index 024469d..36bda58 100644 (file)
--- a/app/assets/javascripts/models/system_picture.js.coffee
+++ b/app/assets/javascripts/models/system_picture.js.coffee
@@ -12,7 +12,7 @@ class Pettanr.SystemPicture extends Peta.SystemResource
   } \r
   \r
   picture: () ->\r
-    new Pettanr.Picture({id: @get('picture_id')})\r
+    new Pettanr.Cache.Retriever(Pettanr.Picture, @get('picture_id'))\r
   \r
   filename: () ->\r
     @get('id') + '.' + @get('ext')\r
@@ -34,12 +34,16 @@ class Pettanr.SystemPicture extends Peta.SystemResource
       picture: this\r
     })\r
   \r
-  symbol_option: (cb) ->\r
-    _this = this\r
-    this.fetch({cache: true}).done ->\r
-      cb(_this.tmb_opt_img_tag())\r
+  symbol_option: () ->\r
+    retriever = @retriever()\r
+    @listenTo(retriever, 'retrieve', @retrieve_symbol)\r
+    retriever.retrieve()\r
   \r
-  initialize: () ->\r
+  retrieve_symbol: (item) -> \r
+    @trigger('ready:symbol', item.tmb_opt_img_tag())\r
+  \r
+  initialize: (attr = {}, options = {}) ->\r
+    super(attr, options)\r
     if @id\r
       @url = @url + @id\r
   \r