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 0682e06..a699cce 100644 (file)
--- a/app/assets/javascripts/models/ground_picture.js.coffee
+++ b/app/assets/javascripts/models/ground_picture.js.coffee
@@ -17,8 +17,8 @@ class Pettanr.GroundPicture extends Peta.Element
   @repeat_texts: () -> \r
     ['repeat', 'repeat-x', 'repeat-y', 'no-repeat']\r
   \r
-  panel: () ->\r
-    new Pettanr.Panel({id: @get('panel_id')})\r
+  panel: (options = {}) ->\r
+    new Pettanr.Panel({id: @get('panel_id')}, options)\r
   \r
   picture: () ->\r
     new Pettanr.Picture({id: @get('picture_id')})\r
@@ -30,7 +30,7 @@ class Pettanr.GroundPicture extends Peta.Element
     new Pettanr.Image.SymbolPicture({\r
       attr: {\r
         src: picture.r_url(), \r
-        alt: @get('caption')\r
+        alt: @escape('caption')\r
       },\r
       picture: picture\r
     })\r
@@ -38,8 +38,7 @@ class Pettanr.GroundPicture extends Peta.Element
   symbol_option: () ->\r
     i = @picture()\r
     i.fetch({cache: true}).done =>\r
-      @symbol_picture = i.tmb_opt_img_tag()\r
-      @trigger('ready:symbol')\r
+      @trigger('ready:symbol', i.tmb_opt_img_tag())\r
   \r
   repeat_text: () ->\r
     Pettanr.GroundPicture.repeat_texts()[@get('repeat')]\r