merge:

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

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