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

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

diff --git a/app/assets/javascripts/models/ground_picture.js.coffee b/app/assets/javascripts/models/ground_picture.js.coffee
index 5092b04..ccadfa9 100644 (file)
--- a/app/assets/javascripts/models/ground_picture.js.coffee
+++ b/app/assets/javascripts/models/ground_picture.js.coffee
@@ -38,17 +38,16 @@ class Pettanr.GroundPicture 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
   repeat_text: () ->\r
     Pettanr.GroundPicture.repeat_texts()[@get('repeat')]\r
   \r
+  element_face: () ->\r
+    new Pettanr.Views.GroundPicture.ElementFace({element: this})\r
+  \r
   initialize: () ->\r
     if @id\r
       @url = @url + @id\r
   \r
-class Pettanr.GroundPicture.Collection extends Backbone.Collection\r
-  model: Pettanr.GroundPicture\r
-  url: '/ground_pictures/'\r
-  \r