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

diff --git a/app/assets/javascripts/models/panel_picture.js.coffee b/app/assets/javascripts/models/panel_picture.js.coffee
index b2dca07..00ab992 100644 (file)
--- a/app/assets/javascripts/models/panel_picture.js.coffee
+++ b/app/assets/javascripts/models/panel_picture.js.coffee
@@ -14,8 +14,8 @@ class Pettanr.PanelPicture extends Peta.Element
   picture: () ->\r
     new Pettanr.Picture({id: @get('picture_id')})\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
   @has_picture: () ->\r
     true\r

diff --git a/app/assets/javascripts/peta/element.js.coffee b/app/assets/javascripts/peta/element.js.coffee
index 45ef5a5..2ab6467 100644 (file)
--- a/app/assets/javascripts/peta/element.js.coffee
+++ b/app/assets/javascripts/peta/element.js.coffee
@@ -1,6 +1,6 @@
 class Peta.Element extends Peta.ElementNestableContent\r
   merge_opacity: (style_hash, opacity) ->\r
     _.extend(style_hash, {\r
-      opacity: opacity.to_f/100, \r
+      opacity: opacity/100, \r
       filter: 'alpha(opacity=' + Pettanr.to_s(opacity) + ')'\r
     })\r

diff --git a/app/assets/javascripts/pettanr.js.coffee b/app/assets/javascripts/pettanr.js.coffee
index 966bcb5..65a2d07 100644 (file)
--- a/app/assets/javascripts/pettanr.js.coffee
+++ b/app/assets/javascripts/pettanr.js.coffee
@@ -97,6 +97,7 @@ class Pettanr
       datetime\r
   \r
   @cache = {}\r
+  @credits = {}\r
   \r
   class Pettanr.FilerCollection extends Backbone.Collection\r
     \r

diff --git a/app/assets/javascripts/views/balloons/summary.js.coffee b/app/assets/javascripts/views/balloons/summary.js.coffee
index 69abf34..705b485 100644 (file)
--- a/app/assets/javascripts/views/balloons/summary.js.coffee
+++ b/app/assets/javascripts/views/balloons/summary.js.coffee
@@ -7,9 +7,9 @@ class Pettanr.Views.Balloon.Summary extends Backbone.View
   render: () ->\r
     this.$el.html('')\r
     _this = this\r
-    @speech_balloon.fetch().done ->\r
+    @speech_balloon.fetch({cache: true}).done ->\r
       panel = _this.speech_balloon.panel()\r
-      panel.fetch().done ->\r
+      panel.fetch({cache: true}).done ->\r
         panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true})\r
         _this.$el.append(panel_icon.render().el)\r
     this\r

diff --git a/app/assets/javascripts/views/ground_colors/element.js.coffee b/app/assets/javascripts/views/ground_colors/element.js.coffee
index d72481a..94e8429 100644 (file)
--- a/app/assets/javascripts/views/ground_colors/element.js.coffee
+++ b/app/assets/javascripts/views/ground_colors/element.js.coffee
@@ -60,6 +60,5 @@ class Pettanr.Views.GroundColor.Element extends Backbone.View
       height: Pettanr.to_s(@div_height()) + '%', \r
       'background-color': '#' + ('000000' + @element.get('code').toString(16)).slice(-6)\r
     }\r
-    @merge_opacity(r, opacity) if spot and spot != @element\r
     r\r
   \r

diff --git a/app/assets/javascripts/views/ground_colors/summary.js.coffee b/app/assets/javascripts/views/ground_colors/summary.js.coffee
index 3711393..b146fce 100644 (file)
--- a/app/assets/javascripts/views/ground_colors/summary.js.coffee
+++ b/app/assets/javascripts/views/ground_colors/summary.js.coffee
@@ -7,7 +7,7 @@ class Pettanr.Views.GroundColor.Summary extends Backbone.View
     this.$el.html('')\r
     _this = this\r
     panel = @item.panel()\r
-    panel.fetch().done ->\r
+    panel.fetch({cache: true}).done ->\r
       panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true})\r
       _this.$el.append(panel_icon.render().el)\r
     this\r

diff --git a/app/assets/javascripts/views/ground_pictures/element.js.coffee b/app/assets/javascripts/views/ground_pictures/element.js.coffee
index 8323822..135a1d1 100644 (file)
--- a/app/assets/javascripts/views/ground_pictures/element.js.coffee
+++ b/app/assets/javascripts/views/ground_pictures/element.js.coffee
@@ -26,7 +26,6 @@ class Pettanr.Views.GroundPicture.Element extends Backbone.View
       'background-repeat': @repeat_text(), \r
       'background-position': Pettanr.to_s(@element.get('x')) + 'px ' + Pettanr.to_s(@element.get('y')) + 'px'\r
     }\r
-    @merge_opacity(r, opacity) if spot and spot != @element\r
     r\r
   \r
   style_wh: () ->\r

diff --git a/app/assets/javascripts/views/ground_pictures/summary.js.coffee b/app/assets/javascripts/views/ground_pictures/summary.js.coffee
index e0f8949..1fc26be 100644 (file)
--- a/app/assets/javascripts/views/ground_pictures/summary.js.coffee
+++ b/app/assets/javascripts/views/ground_pictures/summary.js.coffee
@@ -7,11 +7,11 @@ class Pettanr.Views.GroundPicture.Summary extends Backbone.View
   render: () ->\r
     this.$el.html('')\r
     _this = this\r
-    @picture.fetch().done ->\r
+    @picture.fetch({cache: true}).done ->\r
       credit = _this.picture.credit_view(false)\r
       _this.$el.append(credit.render().el)\r
       panel = _this.item.panel()\r
-      panel.fetch().done ->\r
+      panel.fetch({cache: true}).done ->\r
         panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true})\r
         _this.$el.append(panel_icon.render().el)\r
     this\r

diff --git a/app/assets/javascripts/views/panel_pictures/element.js.coffee b/app/assets/javascripts/views/panel_pictures/element.js.coffee
index d72cb69..eb5ea8e 100644 (file)
--- a/app/assets/javascripts/views/panel_pictures/element.js.coffee
+++ b/app/assets/javascripts/views/panel_pictures/element.js.coffee
@@ -29,8 +29,8 @@ class Pettanr.Views.PanelPicture.Element extends Backbone.View
   \r
   opt_img_tag: (spot = null, opacity = 20) ->\r
     style = {}\r
-    if spot and spot != @element\r
-      @merge_opacity(style, opacity)\r
+    if spot and spot.constructor == @element.constructor and spot.get('id') != @element.get('id')\r
+      @element.merge_opacity(style, opacity)\r
     {\r
       vPicture: @element.get('id'), \r
       src: @element.r_url(@picture), \r

diff --git a/app/assets/javascripts/views/panel_pictures/show.js.coffee b/app/assets/javascripts/views/panel_pictures/show.js.coffee
index 86abec9..dddd872 100644 (file)
--- a/app/assets/javascripts/views/panel_pictures/show.js.coffee
+++ b/app/assets/javascripts/views/panel_pictures/show.js.coffee
@@ -23,14 +23,24 @@ class Pettanr.Views.PanelPicture.Show extends Backbone.View
       prof_url: prof_url\r
     })\r
     _this = this\r
-    @panel = @item.panel()\r
-    @panel.fetch({cache: true}).done ->\r
+    @panel = @item.panel({with_elements: true})\r
+    @panel.fetch({cache: false}).done ->  # with elements\r
       _this.author = new Pettanr.Views.Show.HeaderAuthor({item: _this.panel})\r
+      _this.body = new Pettanr.Views.Panel.Body({\r
+        panel: _this.panel,\r
+        operators: _this.operators,\r
+        spot: _this.item\r
+      })\r
+      _this.credits = new Pettanr.Views.Panel.Show.Credits({panel: _this.panel})\r
+      rb = new Tag.RowBreak()\r
+      _this.$el.append(rb.render().el)\r
       _this.render()\r
   \r
   render: () ->\r
     this.$el.html('')\r
     this.$el.append(@header.render().el)\r
     this.$el.append(@author.render().el)\r
+    this.$el.append(@body.render().el)\r
+    this.$el.append(@credits.render().el)\r
     this\r
   \r

diff --git a/app/assets/javascripts/views/panel_pictures/summary.js.coffee b/app/assets/javascripts/views/panel_pictures/summary.js.coffee
index 978849b..a92c55d 100644 (file)
--- a/app/assets/javascripts/views/panel_pictures/summary.js.coffee
+++ b/app/assets/javascripts/views/panel_pictures/summary.js.coffee
@@ -7,11 +7,11 @@ class Pettanr.Views.PanelPicture.Summary extends Backbone.View
   render: () ->\r
     this.$el.html('')\r
     _this = this\r
-    @picture.fetch().done ->\r
+    @picture.fetch({cache: true}).done ->\r
       credit = _this.picture.credit_view(false)\r
       _this.$el.append(credit.render().el)\r
       panel = _this.item.panel()\r
-      panel.fetch().done ->\r
+      panel.fetch({cache: true}).done ->\r
         panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true})\r
         _this.$el.append(panel_icon.render().el)\r
     this\r

diff --git a/app/assets/javascripts/views/panels/show.js.coffee b/app/assets/javascripts/views/panels/show.js.coffee
index 938a284..88d8667 100644 (file)
--- a/app/assets/javascripts/views/panels/show.js.coffee
+++ b/app/assets/javascripts/views/panels/show.js.coffee
@@ -35,7 +35,7 @@ class Pettanr.Views.Panel.Show.Credits extends Backbone.View
     _this = this\r
     this.$el.html('')\r
     _.each @pictures, (picture) ->\r
-      picture.fetch().done ->\r
+      picture.fetch({cache: true}).done ->\r
         credit = picture.credit_view()\r
         _this.$el.append(credit.render().el)\r
     this\r

diff --git a/app/assets/javascripts/views/pictures/credit.js.coffee b/app/assets/javascripts/views/pictures/credit.js.coffee
index 97aedaf..94bbef1 100644 (file)
--- a/app/assets/javascripts/views/pictures/credit.js.coffee
+++ b/app/assets/javascripts/views/pictures/credit.js.coffee
@@ -13,10 +13,15 @@ class Pettanr.Views.Picture.Credit extends Backbone.View
       p = @item.credit_icon_view()\r
       this.$el.append(p.render().el)\r
     _this = this\r
-    f = (data, status) ->\r
-      _this.$el.append(data)\r
-      rb = new Tag.RowBreak()\r
-      _this.$el.append(rb.render().el)\r
-    $.get(@url, null, f, 'html')\r
+    if Pettanr.credits[@url]\r
+      this.$el.append(Pettanr.credits[@url])\r
+      this.$el.append((new Tag.RowBreak()).render().el)\r
+    else\r
+      f = (data, status) ->\r
+        Pettanr.credits[_this.url] = data\r
+        _this.$el.append(data)\r
+        rb = new Tag.RowBreak()\r
+        _this.$el.append(rb.render().el)\r
+      $.get(@url, null, f, 'html')\r
     this\r
   \r

diff --git a/app/assets/javascripts/views/resource_pictures/summary.js.coffee b/app/assets/javascripts/views/resource_pictures/summary.js.coffee
index b8e0ded..e355f62 100644 (file)
--- a/app/assets/javascripts/views/resource_pictures/summary.js.coffee
+++ b/app/assets/javascripts/views/resource_pictures/summary.js.coffee
@@ -7,7 +7,7 @@ class Pettanr.Views.ResourcePicture.Summary extends Backbone.View
   render: () ->\r
     this.$el.html('')\r
     _this = this\r
-    @picture.fetch().done ->\r
+    @picture.fetch({cache: true}).done ->\r
       credit = _this.picture.credit_view(false)\r
       _this.$el.append(credit.render().el)\r
     this\r

diff --git a/app/assets/javascripts/views/speech_balloons/summary.js.coffee b/app/assets/javascripts/views/speech_balloons/summary.js.coffee
index eb8fafd..72d8b72 100644 (file)
--- a/app/assets/javascripts/views/speech_balloons/summary.js.coffee
+++ b/app/assets/javascripts/views/speech_balloons/summary.js.coffee
@@ -7,7 +7,7 @@ class Pettanr.Views.SpeechBalloon.Summary extends Backbone.View
     this.$el.html('')\r
     _this = this\r
     panel = @item.panel()\r
-    panel.fetch().done ->\r
+    panel.fetch({cache: true}).done ->\r
       panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true})\r
       _this.$el.append(panel_icon.render().el)\r
     this\r

diff --git a/app/assets/javascripts/views/speeches/summary.js.coffee b/app/assets/javascripts/views/speeches/summary.js.coffee
index 5bb4320..390aa2e 100644 (file)
--- a/app/assets/javascripts/views/speeches/summary.js.coffee
+++ b/app/assets/javascripts/views/speeches/summary.js.coffee
@@ -7,9 +7,9 @@ class Pettanr.Views.Speech.Summary extends Backbone.View
   render: () ->\r
     this.$el.html('')\r
     _this = this\r
-    @speech_balloon.fetch().done ->\r
+    @speech_balloon.fetch({cache: true}).done ->\r
       panel = _this.speech_balloon.panel()\r
-      panel.fetch().done ->\r
+      panel.fetch({cache: true}).done ->\r
         panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true})\r
         _this.$el.append(panel_icon.render().el)\r
     this\r