fix: scenario

diff --git a/app/assets/javascripts/editor/panel_editor/dock.js.coffee b/app/assets/javascripts/editor/panel_editor/dock.js.coffee
index f1e3b22..2df7e39 100644 (file)
--- a/app/assets/javascripts/editor/panel_editor/dock.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor/dock.js.coffee
@@ -96,6 +96,7 @@ class Editor.PanelEditor.Dock extends Editor.EditorModule.DockBase
     # merge panel and elements\r
     attrs = @root_bay.save_data()\r
     _.extend(attrs, @element_bay.save_data())\r
     # merge panel and elements\r
     attrs = @root_bay.save_data()\r
     _.extend(attrs, @element_bay.save_data())\r

+    $.extend(true, attrs, @scenario_bay.save_data()) # deep merge by jQuery\r

     # save json data by panel form\r
     @root_bay.body.form.save(attrs)\r
   \r
     # save json data by panel form\r
     @root_bay.body.form.save(attrs)\r
   \r

diff --git a/app/assets/javascripts/editor/panel_editor/scenario.js.coffee b/app/assets/javascripts/editor/panel_editor/scenario.js.coffee
index 366e035..c58c188 100644 (file)
--- a/app/assets/javascripts/editor/panel_editor/scenario.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor/scenario.js.coffee
@@ -23,7 +23,7 @@ class Editor.EditorModule.DockModule.ScenarioBay extends Editor.EditorModule.Doc
     @add_element(new_item)\r
   \r
   save_data: () ->\r
     @add_element(new_item)\r
   \r
   save_data: () ->\r

-    @body.form.save_data()\r
+    @body.save_data()\r

   \r
   length: () ->\r
     @body.length()\r
   \r
   length: () ->\r
     @body.length()\r


@@ -70,3 +70,12 @@ class Editor.EditorModule.DockModule.TabModule.ScenarioBayBody extends Editor.Ed
   length: () ->\r
     @elements.element_lis.length\r
   \r
   length: () ->\r
     @elements.element_lis.length\r
   \r

+  save_data: () ->\r
+    attrs = {}\r
+    _.each @elements.element_lis, (element_li) ->\r
+      form = element_li.body.form\r
+      name = form.item.table_name() + '_attributes'\r
+      attrs[name] ||= []\r
+      attrs[name].push(form.save_data())\r
+    attrs\r
+  \r

diff --git a/app/assets/javascripts/views/balloons/element.js.coffee b/app/assets/javascripts/views/balloons/element.js.coffee
index b55600f..bec504e 100644 (file)
--- a/app/assets/javascripts/views/balloons/element.js.coffee
+++ b/app/assets/javascripts/views/balloons/element.js.coffee
@@ -18,7 +18,7 @@ class Pettanr.Views.Balloon.Element extends Pettanr.View
   set_style: () ->\r
     attr = {\r
       src: @system_picture.picture_file().src(), \r
   set_style: () ->\r
     attr = {\r
       src: @system_picture.picture_file().src(), \r

-      alt: @element.get('caption'),\r
+      alt: @speech_balloon.element.get('caption'),\r

       style: Pettanr.to_style(@style())\r
     }\r
     this.$el.attr(attr)\r
       style: Pettanr.to_style(@style())\r
     }\r
     this.$el.attr(attr)\r

diff --git a/app/models/panel_picture.rb b/app/models/panel_picture.rb
index 2406f77..bf3463f 100644 (file)
--- a/app/models/panel_picture.rb
+++ b/app/models/panel_picture.rb
@@ -104,7 +104,9 @@ class PanelPicture < Peta::Element
     o = (spot and spot != self) ? "opacity: #{opacity.to_f/100}; filter:alpha(opacity=#{opacity});" : ''
     self.tag_attributes(:img, {
       :class => "panel-picture", :vPicture => self.id, 
     o = (spot and spot != self) ? "opacity: #{opacity.to_f/100}; filter:alpha(opacity=#{opacity});" : ''
     self.tag_attributes(:img, {
       :class => "panel-picture", :vPicture => self.id, 

-      :src => self.url, :width => self.width.abs, :height => self.height.abs, :picture_id => self.picture_id, :ext => self.picture.ext, :alt => self.caption, 
+      :src => self.url, :width => self.width.abs, :height => self.height.abs, 
+      :picture_id => self.picture_id, :ext => self.picture.ext, 
+      :alt => self.caption, 

       :style => "#{o}"
     })
   end
       :style => "#{o}"
     })
   end