v07

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

diff --git a/app/assets/javascripts/models/picture.js.coffee b/app/assets/javascripts/models/picture.js.coffee
index 0cc5a67..6dce315 100644 (file)
--- a/app/assets/javascripts/models/picture.js.coffee
+++ b/app/assets/javascripts/models/picture.js.coffee
@@ -27,31 +27,12 @@ class Pettanr.Picture extends Peta.Content
   mime_type: () ->\r
     'image/' + @get('ext')\r
   \r
-  r_url: () ->\r
-    '/pictures/' + @filename()\r
-  \r
-  img_option: () ->\r
-    title = if @['get']  # is instance?\r
-      @model_name() + ' ID:' + Pettanr.to_s(@get('id'))\r
+  r_url: (subdir = null) ->\r
+    q = if subdir\r
+      '?subdir=' + subdir\r
     else\r
-      @model_name()\r
-    {\r
-      title: title\r
-      alt: @model_name()\r
-    }\r
-  \r
-  opt_img_tag: () ->\r
-    {src: @r_url(), width: @get('width'), height: @get('height')}\r
-  \r
-  tmb_opt_img_tag: () ->\r
-    @symbol_file()\r
-  \r
-  tail_opt_img_tag: (img) ->\r
-    {src: img, width: @get('width'), height: @get('height')}\r
-  \r
-  tail_tmb_opt_img_tag: (img) ->\r
-    wh = Pettanr.Imager.thumbnail_size(@get('width'), @get('height'))\r
-    {src: img, width: wh[0], height: wh[1]}\r
+      ''\r
+    '/pictures/' + @filename() + q\r
   \r
   alt_name: () ->\r
     lgn = Pettanr.to_s(@license().license_group().get('caption'))\r
@@ -61,7 +42,9 @@ class Pettanr.Picture extends Peta.Content
   symbol_option: (context, options) ->\r
     @retrieve(this, {\r
       success: (symbol_item) => \r
-        options.success.call(context, symbol_item.to_symbol())\r
+        options.success.call(context, symbol_item.symbol_file())\r
+      fail: (response, opt) =>\r
+        options.fail.call(context, response, opt)\r
     })\r
   \r
   is_enable: () ->\r
@@ -90,28 +73,6 @@ class Pettanr.Picture extends Peta.Content
     return true if @is_own(operators)\r
     #@is_enable() and @is_head()\r
   \r
-  history_view: () ->\r
-    new Pettanr.Views.Picture.History({item: this})\r
-  \r
-  credit_icon_view: () ->\r
-    new Pettanr.Views.Picture.CreditIcon({item: this})\r
-  \r
-  credit_view: (with_icon = true) ->\r
-    new Pettanr.Views.Picture.Credit({item: this, with_icon: with_icon})\r
-  \r
-  picture_file: (subdir = null) ->\r
-    new Pettanr.PictureFile(this, subdir)\r
-  \r
-  fetch: (options) ->\r
-    if @id\r
-      @credit_icon = @credit_icon_view()\r
-      @credit = null\r
-      f = (data, status) =>\r
-        @credit = data\r
-        @trigger('ready')\r
-      $.get(@url + '/credit', null, f, 'html')\r
-    super(options)\r
-  \r
   initialize: (attr = {}, options = {}) ->\r
     super(attr, options)\r
   \r