X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fassets%2Fjavascripts%2Fmodels%2Fpanel_picture.js.coffee;h=7544193e17ff534b3bdb7404bf5b894e3d298417;hb=091b085aa054691dfe37d6f55f699dcb80f63ee5;hp=22465d24734859d0202df0931ec195da683bb37e;hpb=ed6c8f3dd0ed56cc3f636e9c0cca25b785ad6027;p=pettanr%2Fpettanr.git

diff --git a/app/assets/javascripts/models/panel_picture.js.coffee b/app/assets/javascripts/models/panel_picture.js.coffee
index 22465d24..7544193e 100644
--- a/app/assets/javascripts/models/panel_picture.js.coffee
+++ b/app/assets/javascripts/models/panel_picture.js.coffee
@@ -35,7 +35,11 @@ class Pettanr.PanelPicture extends Peta.Element
     res
   
   filename: (picture) ->
-    picture.filename() + '?subdir=' + @flip()
+    q = if _.isEmpty(@flip())
+      ''
+    else
+      '?subdir=' + @flip()
+    picture.filename() + q
   
   r_url: (picture) ->
     '/pictures/' + @filename(picture)
@@ -44,7 +48,7 @@ class Pettanr.PanelPicture extends Peta.Element
     new Pettanr.Image.SymbolPicture({
       attr: {
         src: picture.r_url(), 
-        alt: @get('caption')
+        alt: @escape('caption')
       },
       picture: picture
     })