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 efb2e17..6a82a51 100644 (file)
--- a/app/assets/javascripts/models/resource_picture.js.coffee
+++ b/app/assets/javascripts/models/resource_picture.js.coffee
@@ -1,5 +1,4 @@
 class Pettanr.ResourcePicture extends Peta.Content\r
-  url: '/resource_pictures/'\r
   \r
   @singular: () ->\r
     'ResourcePicture'\r
@@ -11,7 +10,7 @@ class Pettanr.ResourcePicture extends Peta.Content
     id: null\r
   } \r
   \r
-  is_visible: (operators) ->\r
+  is_visible: (operators = Pettanr.cache.operators) ->\r
     @is_user_visible(operators)\r
   \r
   filename: () ->\r
@@ -24,37 +23,33 @@ class Pettanr.ResourcePicture extends Peta.Content
     'image/' + @get('ext')\r
   \r
   r_url: (subdir = null) ->\r
-    opt = if Pettanr.to_s(@subdir).empty\r
+    opt = if _.isEmpty(subdir)\r
       ''\r
     else\r
       '?subdir=' + Pettanr.to_s(subdir)\r
     '/resource_pictures/' + @filename() + opt\r
   \r
-  tmb_opt_img_tag: () ->\r
-    new Pettanr.Picture.SymbolPicture({\r
-      attr: {\r
-        src: @r_url()\r
-      },\r
-      picture: this\r
-    })\r
+  symbol_file: () ->\r
+    subdir = if @no_resize()\r
+      'full'\r
+    else\r
+      null\r
+    super(subdir)\r
   \r
-  opt_img_tag: () ->\r
-    {src: @url('full'), width: @get('width'), height: @get('height')}\r
+  no_resize: () ->\r
+    false\r
   \r
   alt_name: () ->\r
     lgn = Pettanr.to_s(@license().license_group().get('caption'))\r
     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: (context, options) ->\r
+    @retrieve(this, {\r
+      success: (symbol_item) => \r
+        options.success.call(context, symbol_item.symbol_file())\r
+    })\r
   \r
-  initialize: () ->\r
-    if @id\r
-      @url = @url + @id\r
+  initialize: (attr = {}, options = {}) ->\r
+    super(attr, options)\r
   \r
-class Pettanr.ResourcePicture.Collection extends Backbone.Collection\r
-  model: Pettanr.ResourcePicture\r
-  url: '/resource_pictures/'\r