change: cache system

[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 ccadfa9..95e0870 100644 (file)
--- a/app/assets/javascripts/models/ground_picture.js.coffee
+++ b/app/assets/javascripts/models/ground_picture.js.coffee
@@ -17,11 +17,24 @@ class Pettanr.GroundPicture extends Peta.Element
   @repeat_texts: () -> \r
     ['repeat', 'repeat-x', 'repeat-y', 'no-repeat']\r
   \r
+  @pick_item_name: () ->\r
+    'resource_picture'\r
+  \r
+  @traceable_item_names: () ->\r
+    ['panel_picture', 'picture']\r
+  \r
+  trace_from_panel_picture: () ->\r
+  \r
+  trace_from_picture: () ->\r
+  \r
+  pick: (picked_item) ->\r
+    {picture_id: picked_item.get('picture_id')}\r
+  \r
   panel: () ->\r
-    new Pettanr.Panel({id: @get('panel_id')})\r
+    new Pettanr.Cache.Retriever(Pettanr.Panel, @get('panel_id'))\r
   \r
   picture: () ->\r
-    new Pettanr.Picture({id: @get('picture_id')})\r
+    new Pettanr.Cache.Retriever(Pettanr.Picture, @get('picture_id'))\r
   \r
   @has_picture: () ->\r
     true\r
@@ -30,16 +43,18 @@ class Pettanr.GroundPicture extends Peta.Element
     new Pettanr.Image.SymbolPicture({\r
       attr: {\r
         src: picture.r_url(), \r
-        alt: @get('caption')\r
+        alt: @escape('caption')\r
       },\r
       picture: picture\r
     })\r
   \r
-  symbol_option: (cb) ->\r
-    i = @picture()\r
-    _this = this\r
-    i.fetch({cache: true}).done ->\r
-      cb(_this.tmb_opt_img_tag(i))\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
   \r
   repeat_text: () ->\r
     Pettanr.GroundPicture.repeat_texts()[@get('repeat')]\r
@@ -47,7 +62,8 @@ class Pettanr.GroundPicture extends Peta.Element
   element_face: () ->\r
     new Pettanr.Views.GroundPicture.ElementFace({element: this})\r
   \r
-  initialize: () ->\r
+  initialize: (attr, options) ->\r
+    super(attr, options)\r
     if @id\r
       @url = @url + @id\r
   \r