X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fassets%2Fjavascripts%2Fmodels%2Fresource_picture.js.coffee;h=6a82a510f9bc1d90deec7697a5827e813d3de247;hb=00f1b75256d14796fa5b6f75c79dabe4ecbe35ed;hp=fafa3dcb806e1ab0f39e5172119276278792b678;hpb=a4838064801c37fddc101f493c654cf0b2c78db4;p=pettanr%2Fpettanr.git

diff --git a/app/assets/javascripts/models/resource_picture.js.coffee b/app/assets/javascripts/models/resource_picture.js.coffee
index fafa3dcb..6a82a510 100644
--- 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
-  url: '/resource_pictures/'
   
   @singular: () ->
     'ResourcePicture'
@@ -11,7 +10,7 @@ class Pettanr.ResourcePicture extends Peta.Content
     id: null
   } 
   
-  is_visible: (operators) ->
+  is_visible: (operators = Pettanr.cache.operators) ->
     @is_user_visible(operators)
   
   filename: () ->
@@ -24,31 +23,33 @@ class Pettanr.ResourcePicture extends Peta.Content
     'image/' + @get('ext')
   
   r_url: (subdir = null) ->
-    opt = if Pettanr.to_s(@subdir).empty
+    opt = if _.isEmpty(subdir)
       ''
     else
       '?subdir=' + Pettanr.to_s(subdir)
     '/resource_pictures/' + @filename() + opt
   
-  tmb_opt_img_tag: () ->
-    wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height'))
-    {src: @r_url(), width: wh[0], height: wh[1]}
+  symbol_file: () ->
+    subdir = if @no_resize()
+      'full'
+    else
+      null
+    super(subdir)
   
-  opt_img_tag: () ->
-    {src: @url('full'), width: @get('width'), height: @get('height')}
+  no_resize: () ->
+    false
   
   alt_name: () ->
     lgn = Pettanr.to_s(@license().license_group().get('caption'))
     ln = Pettanr.to_s(@license().get('caption'))
     lgn + '[' + ln + ']'
   
-  symbol_option: () ->
-    @tmb_opt_img_tag()
+  symbol_option: (context, options) ->
+    @retrieve(this, {
+      success: (symbol_item) => 
+        options.success.call(context, symbol_item.symbol_file())
+    })
   
-  initialize: () ->
-    if @id
-      @url = @url + @id
+  initialize: (attr = {}, options = {}) ->
+    super(attr, options)
   
-class Pettanr.ResourcePicture.Collection extends Backbone.Collection
-  model: Pettanr.ResourcePicture
-  url: '/resource_pictures/'