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

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

diff --git a/app/assets/javascripts/models/original_picture.js.coffee b/app/assets/javascripts/models/original_picture.js.coffee
index f3deddc..06441e3 100644 (file)
--- a/app/assets/javascripts/models/original_picture.js.coffee
+++ b/app/assets/javascripts/models/original_picture.js.coffee
@@ -11,12 +11,6 @@ class Pettanr.OriginalPicture extends Peta.Content
     artist_id: null\r
   } \r
   \r
-  picture: () ->\r
-    new Pettanr.Cache.Retriever(Pettanr.Picture, @get('picture_id'))\r
-  \r
-  artist: () ->\r
-    new Pettanr.Cache.Retriever(Pettanr.Artist, @get('artist_id'))\r
-  \r
   is_visible: (operators = Pettanr.cache.operators) ->\r
     @is_own(operators)\r
   \r
@@ -32,26 +26,13 @@ class Pettanr.OriginalPicture extends Peta.Content
   license_url: () ->\r
     '/original_picture_license_groups/new/' + @get('id')\r
   \r
-  opt_img_tag: () ->\r
-    {src: @r_url(), width: @get('width'), height: @get('height')}\r
-  \r
-  tmb_opt_img_tag: () ->\r
-    new Pettanr.Image.SymbolPicture({\r
-      attr: {\r
-        src: @r_url()\r
-      },\r
-      picture: this\r
+  symbol_option: (context, options) ->\r
+    @retrieve(this, {\r
+      success: (symbol_item) => \r
+        options.success.call(context, symbol_item.symbol_file())\r
     })\r
   \r
-  symbol_option: () ->\r
-    retriever = @retriever()\r
-    @listenTo(retriever, 'retrieve', @retrieve_symbol)\r
-    retriever.retrieve()\r
-  \r
-  retrieve_symbol: (item) -> \r
-    @trigger('ready:symbol', item.tmb_opt_img_tag())\r
-  \r
-  filer_caption: () ->\r
+  filer_caption: (context, options) ->\r
     history = @history()\r
     history.fetch({cache: true}).done =>\r
       caption = if _.isEmpty(history.models)\r
@@ -59,7 +40,7 @@ class Pettanr.OriginalPicture extends Peta.Content
       else\r
         head = _.first(history.models)\r
         Pettanr.to_s(head.get('revision'))\r
-      @trigger('ready:caption', caption)\r
+      options.success.call(context, caption)\r
   \r
   revision: () ->\r
     new Pettanr.OriginalPicture.Head({original_picture: this})\r