fix:retrive

[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 12241b2..78c3c29 100644 (file)
--- a/app/assets/javascripts/models/panel_picture.js.coffee
+++ b/app/assets/javascripts/models/panel_picture.js.coffee
@@ -66,12 +66,10 @@ class Pettanr.PanelPicture extends Peta.Element
     })\r
   \r
   symbol_option: () ->\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
+    @get_parent('picture', this, {\r
+      success: (picture) => \r
+        @trigger('ready:symbol', picture.tmb_opt_img_tag())\r
+    })\r
   \r
   element_face: () ->\r
     new Pettanr.Views.PanelPicture.ElementFace({element: this})\r
@@ -91,28 +89,24 @@ class Pettanr.PanelPicture.TraceFromPicture
     resource_picture_picture_list = picture.has_one('resource_picture_picture')\r
     resource_picture_picture_list.open(() =>\r
       resource_picture_picture = resource_picture_picture_list.items()[0]\r
-      retriever = new Pettanr.Cache.Retriever(Pettanr.ResourcePicture, resource_picture_picture.get('resource_picture_id'))\r
-      @listenTo(retriever, 'retrieve', @resource_picture)\r
-      retriever.retrieve()\r
+      resource_picture_picture.get_parent('resource_picture', this, {\r
+        success: (resource_picture) => \r
+          @trigger('trace', resource_picture)\r
+      })\r
     )\r
   \r
-  resource_picture: (resource_picture) ->\r
-    @trigger('trace', resource_picture)\r
-  \r
 class Pettanr.PanelPicture.TraceFromGroundPicture extends Pettanr.PanelPicture.TraceFromPicture\r
   \r
   trace: (ground_picture) ->\r
     @ground_picture(ground_picture)\r
   \r
   ground_picture: (ground_picture) ->\r
-    retriever = new Pettanr.Cache.Retriever(Pettanr.Picture, ground_picture.get('picture_id'))\r
-    @listenTo(retriever, 'retrieve', @picture)\r
-    retriever.retrieve()\r
-  \r
-  picture: (picture) ->\r
-    tracer = new Pettanr.PanelPicture.TraceFromPicture()\r
-    @listenTo(tracer, 'trace', @success)\r
-    tracer.trace(picture)\r
+    ground_picture.get_parent('picture', this, {\r
+      success: (picture) => \r
+        tracer = new Pettanr.PanelPicture.TraceFromPicture()\r
+        @listenTo(tracer, 'trace', @success)\r
+        tracer.trace(picture)\r
+    })\r
   \r
   success: (resource_picture) ->\r
     @trigger('trace', resource_picture)\r