fix:retrive

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

diff --git a/app/assets/javascripts/models/ground_picture.js.coffee b/app/assets/javascripts/models/ground_picture.js.coffee
index 77d074f..0498bef 100644 (file)
--- a/app/assets/javascripts/models/ground_picture.js.coffee
+++ b/app/assets/javascripts/models/ground_picture.js.coffee
@@ -44,12 +44,10 @@ class Pettanr.GroundPicture extends Peta.Element
     })\r
   \r
   symbol_option: () ->\r
-    retriever = @picture()\r
-    @listenTo(retriever, 'retrieve', @retrieve_symbol)\r
-    retriever.retrieve()\r
-  \r
-  retrieve_symbol: (picture) -> \r
-    @trigger('ready:symbol', picture.tmb_opt_img_tag())\r
+    @get_parent('picture', this, {\r
+      success: (picture) => \r
+        @trigger('ready:symbol', picture.tmb_opt_img_tag())\r
+    })\r
   \r
   repeat_text: () ->\r
     Pettanr.GroundPicture.repeat_texts()[@get('repeat')]\r
@@ -72,28 +70,24 @@ class Pettanr.GroundPicture.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
+      Pettanr.ResourcePicture.retrieve(resource_picture_picture.get('resource_picture_id'), 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.GroundPicture.TraceFromPanelPicture extends Pettanr.GroundPicture.TraceFromPicture\r
   \r
   trace: (panel_picture) ->\r
     @panel_picture(panel_picture)\r
   \r
   panel_picture: (panel_picture) ->\r
-    retriever = new Pettanr.Cache.Retriever(Pettanr.Picture, panel_picture.get('picture_id'))\r
-    @listenTo(retriever, 'retrieve', @picture)\r
-    retriever.retrieve()\r
-  \r
-  picture: (picture) ->\r
-    tracer = new Pettanr.GroundPicture.TraceFromPicture()\r
-    @listenTo(tracer, 'trace', @success)\r
-    tracer.trace(picture)\r
+    Pettanr.Picture.retrieve(panel_picture.get('picture_id'), this, {\r
+      success: (picture) => \r
+        tracer = new Pettanr.GroundPicture.TraceFromPicture()\r
+        @listenTo(tracer, 'trace', @success)\r
+        tracer.trace(picture)\r
+    })\r
   \r
   success: (resource_picture) ->\r
     @trigger('trace', resource_picture)\r