X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fassets%2Fjavascripts%2Fmodels%2Fpanel_picture.js.coffee;h=40e47ace37992675bb55dfea1e24da1a908c9e6a;hb=083cd052b6a10be6ddb3534307176f8c415952a8;hp=52b1fd030dc624f2d13d4e2c5373940db95280cc;hpb=7cc9010daab46f2f6ae0b0314904ad9704022e7f;p=pettanr%2Fpettanr.git

diff --git a/app/assets/javascripts/models/panel_picture.js.coffee b/app/assets/javascripts/models/panel_picture.js.coffee
index 52b1fd03..40e47ace 100644
--- a/app/assets/javascripts/models/panel_picture.js.coffee
+++ b/app/assets/javascripts/models/panel_picture.js.coffee
@@ -14,15 +14,9 @@ class Pettanr.PanelPicture extends Peta.Element
   @pick_item_name: () ->
     'resource_picture'
   
-  @pick_model: () ->
-    Manifest.item_name_to_model(@pick_item_name())
-  
   @traceable_item_names: () ->
     ['ground_picture', 'picture']
   
-  @is_traceable: (item_name) ->
-    _.contains(@traceable_item_names(), item_name)
-  
   trace_from_ground_picture: () ->
   
   trace_from_picture: () ->
@@ -35,10 +29,10 @@ class Pettanr.PanelPicture extends Peta.Element
     }
   
   picture: () ->
-    new Pettanr.Picture({id: @get('picture_id')})
+    new Pettanr.Cache.Retriever(Pettanr.Picture, @get('picture_id'))
   
-  panel: (options = {}) ->
-    new Pettanr.Panel({id: @get('panel_id')}, options)
+  panel: () ->
+    new Pettanr.Cache.Retriever(Pettanr.Panel, @get('panel_id'))
   
   @has_picture: () ->
     true
@@ -77,9 +71,12 @@ class Pettanr.PanelPicture extends Peta.Element
     })
   
   symbol_option: () ->
-    i = @picture()
-    i.fetch({cache: true}).done =>
-      @trigger('ready:symbol', i.tmb_opt_img_tag())
+    retriever = @picture()
+    @listenTo(retriever, 'retrieve', @retrieve_symbol)
+    retriever.retrieve()
+  
+  retrieve_symbol: (item) -> 
+    @trigger('ready:symbol', item.tmb_opt_img_tag())
   
   element_face: () ->
     new Pettanr.Views.PanelPicture.ElementFace({element: this})