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

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

diff --git a/app/assets/javascripts/models/panel_picture.js.coffee b/app/assets/javascripts/models/panel_picture.js.coffee
index 7efdae1..3c3003d 100644 (file)
--- a/app/assets/javascripts/models/panel_picture.js.coffee
+++ b/app/assets/javascripts/models/panel_picture.js.coffee
@@ -14,6 +14,9 @@ class Pettanr.PanelPicture extends Peta.Element
   picture: () ->\r
     new Pettanr.Picture({id: @get('picture_id')})\r
   \r
+  panel: (options = {}) ->\r
+    new Pettanr.Panel({id: @get('panel_id')}, options)\r
+  \r
   @has_picture: () ->\r
     true\r
   \r
@@ -31,11 +34,11 @@ class Pettanr.PanelPicture extends Peta.Element
     # res += '/' unless res.empty? # format of /v/1.png\r
     res\r
   \r
-  filename: () ->\r
-    @picture().filename() + '?subdir=' + @flip()\r
+  filename: (picture) ->\r
+    picture.filename() + '?subdir=' + @flip()\r
   \r
-  r_url: () ->\r
-    '/pictures/' + @filename()\r
+  r_url: (picture) ->\r
+    '/pictures/' + @filename(picture)\r
   \r
   tmb_opt_img_tag: (picture) ->\r
     new Pettanr.Image.SymbolPicture({\r
@@ -49,14 +52,13 @@ class Pettanr.PanelPicture extends Peta.Element
   symbol_option: (cb) ->\r
     i = @picture()\r
     _this = this\r
-    i.fetch().done ->\r
+    i.fetch({cache: true}).done ->\r
       cb(_this.tmb_opt_img_tag(i))\r
   \r
+  element_face: () ->\r
+    new Pettanr.Views.PanelPicture.ElementFace({element: this})\r
+  \r
   initialize: () ->\r
     if @id\r
       @url = @url + @id\r
   \r
-class Pettanr.PanelPictures extends Backbone.Collection\r
-  model: Pettanr.PanelPicture\r
-  url: '/panel_pictures/'\r
-  \r