Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/assets/javascripts/models/resource_picture.js.coffee b/app/assets/javascripts/models/resource_picture.js.coffee
index b636dfb..eb13aef 100644 (file)
--- a/app/assets/javascripts/models/resource_picture.js.coffee
+++ b/app/assets/javascripts/models/resource_picture.js.coffee
@@ -11,7 +11,10 @@ class Pettanr.ResourcePicture extends Peta.Content
     id: null\r
   } \r
   \r
-  is_visible: (operators) ->\r
+  picture: () ->\r
+    new Pettanr.Cache.Retriever(Pettanr.Picture, @get('picture_id'))\r
+  \r
+  is_visible: (operators = Pettanr.cache.operators) ->\r
     @is_user_visible(operators)\r
   \r
   filename: () ->\r
@@ -46,15 +49,22 @@ class Pettanr.ResourcePicture extends Peta.Content
     ln = Pettanr.to_s(@license().get('caption'))\r
     lgn + '[' + ln + ']'\r
   \r
-  symbol_option: (cb) ->\r
-    _this = this\r
-    this.fetch().done ->\r
-      cb(_this.tmb_opt_img_tag())\r
+  symbol_option: () ->\r
+    retriever = @retriever()\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
+  credit_icon_view: () ->\r
+    new Pettanr.Views.ResourcePicture.CreditIcon({item: this})\r
   \r
-  initialize: () ->\r
+  credit_view: (with_icon = true) ->\r
+    new Pettanr.Views.ResourcePicture.Credit({item: this, with_icon: with_icon})\r
+  \r
+  initialize: (attr = {}, options = {}) ->\r
+    super(attr, options)\r
     if @id\r
       @url = @url + @id\r
   \r
-class Pettanr.ResourcePicture.Collection extends Backbone.Collection\r
-  model: Pettanr.ResourcePicture\r
-  url: '/resource_pictures/'\r