t#31649:fix panel wrapper

diff --git a/app/assets/javascripts/panels.js.coffee b/app/assets/javascripts/panels.js.coffee
index 38436dc..1c483a6 100644 (file)
--- a/app/assets/javascripts/panels.js.coffee
+++ b/app/assets/javascripts/panels.js.coffee
@@ -1,6 +1,12 @@
 $ ->\r
   repeat_texts = ['repeat', 'repeat-x', 'repeat-y', 'no-repeat']\r
   \r
+  is_editable = (p) ->\r
+    if p.parent().attr('editable')\r
+      return true\r
+    else\r
+      return false\r
+  \r
   panel_tag_id = (element) ->\r
     '#panel' + element.attr('panel_id')\r
   \r
@@ -27,21 +33,22 @@ $ ->
   \r
   # panel\r
   $('.pettanr-comic-panel').map ->\r
-    $(@).resizable {\r
-      stop: ( event, ui ) ->\r
-        trace = panel_tag_id($(@))\r
-        w = parseInt($(@).width())\r
-        h = parseInt($(@).height())\r
-        $(trace + 'width').val(w)\r
-        $(trace + 'height').val(h)\r
-        $('.pettanr-comic-ground-picture').map ->\r
-          $(@).width(w)\r
-          $(@).height(h)\r
-        $('.pettanr-comic-ground-color').map ->\r
-          $(@).width(w)\r
-          $(@).height(h)\r
-        \r
-    }\r
+    if is_editable($(@))\r
+      $(@).resizable {\r
+        stop: ( event, ui ) ->\r
+          trace = panel_tag_id($(@))\r
+          w = parseInt($(@).width())\r
+          h = parseInt($(@).height())\r
+          $(trace + 'width').val(w)\r
+          $(trace + 'height').val(h)\r
+          $('.pettanr-comic-ground-picture').map ->\r
+            $(@).width(w)\r
+            $(@).height(h)\r
+          $('.pettanr-comic-ground-color').map ->\r
+            $(@).width(w)\r
+            $(@).height(h)\r
+          \r
+      }\r
   # sync view \r
   $('#panel' + pettanr_current_panel_id.toString() +  'width').focusout ->\r
     trace = '#panel' + $(@).attr('panel_id')\r

diff --git a/app/views/panels/edit.html.erb b/app/views/panels/edit.html.erb
index f597982..d920028 100644 (file)
--- a/app/views/panels/edit.html.erb
+++ b/app/views/panels/edit.html.erb
@@ -1,7 +1,9 @@
 <h1><%= t '.title' -%></h1>
 <p id="notice"><%= notice %></p>
 
-<%= render 'panels/body', :panel => @panel, :author => @author, :spot => nil %>
-<%= render 'form' %>
+<div id="<%= @panel.tag_id -%>wrapper" panel_id="<%= @panel.tag_panel_id -%>" class="pettanr-panel-wrapper" editable="true">
+  <%= render 'panels/body', :panel => @panel, :author => @author, :spot => nil %>
+  <%= render 'form' %>
+</div>
 <%= link_to t('link.destroy'), panel_path(@panel), :method => :delete %>
 <%= render 'panels/licensed_pictures', :licensed_pictures => @panel.licensed_pictures %>

diff --git a/app/views/panels/new.html.erb b/app/views/panels/new.html.erb
index 765b9c1..3253d12 100644 (file)
--- a/app/views/panels/new.html.erb
+++ b/app/views/panels/new.html.erb
@@ -1,4 +1,6 @@
 <h1><%= t '.title' -%></h1>
 
-<%= render 'panels/body', :panel => @panel, :author => @author, :spot => nil %>
-<%= render 'form' %>
+<div id="<%= @panel.tag_id -%>wrapper" panel_id="<%= @panel.tag_panel_id -%>" class="pettanr-panel-wrapper" editable="true">
+  <%= render 'panels/body', :panel => @panel, :author => @author, :spot => nil %>
+  <%= render 'form' %>
+</div>