X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fassets%2Fjavascripts%2Fmodels%2Fresource_picture.js.coffee;fp=app%2Fassets%2Fjavascripts%2Fmodels%2Fresource_picture.js.coffee;h=e9f093f5e679dad2dbad568bf0bbb8e0535f562a;hp=183ebdbb97ef102d2107a8aaea48de9d51d9abb0;hb=644f57fc419372cbe20d11bc96b4ec5a3d200448;hpb=bccda72efb698fa4813711f28d0b263f249bf6d6

diff --git a/app/assets/javascripts/models/resource_picture.js.coffee b/app/assets/javascripts/models/resource_picture.js.coffee
index 183ebdbb..e9f093f5 100644
--- a/app/assets/javascripts/models/resource_picture.js.coffee
+++ b/app/assets/javascripts/models/resource_picture.js.coffee
@@ -10,15 +10,6 @@ class Pettanr.ResourcePicture extends Peta.Content
     id: null
   } 
   
-  original_picture: () ->
-    new Pettanr.Cache.Retriever(Pettanr.OriginalPicture, @get('original_picture_id'))
-  
-  picture: () ->
-    new Pettanr.Cache.Retriever(Pettanr.Picture, @get('picture_id'))
-  
-  artist: () ->
-    new Pettanr.Cache.Retriever(Pettanr.Artist, @get('artist_id'))
-  
   is_visible: (operators = Pettanr.cache.operators) ->
     @is_user_visible(operators)
   
@@ -56,13 +47,11 @@ class Pettanr.ResourcePicture extends Peta.Content
     ln = Pettanr.to_s(@license().get('caption'))
     lgn + '[' + ln + ']'
   
-  symbol_option: () ->
-    retriever = @retriever()
-    @listenTo(retriever, 'retrieve', @retrieve_symbol)
-    retriever.retrieve()
-  
-  retrieve_symbol: (item) -> 
-    @trigger('ready:symbol', item.tmb_opt_img_tag())
+  symbol_option: (context, options) ->
+    @retrieve(this, {
+      success: (symbol_item) => 
+        options.success.call(context, symbol_item.to_symbol())
+    })
   
   credit_icon_view: () ->
     new Pettanr.Views.ResourcePicture.CreditIcon({item: this})