From ae200a3226cc6407ab381a81ed65f5d7ee557449 Mon Sep 17 00:00:00 2001
From: yasushiito <yas@pen-chan.jp>
Date: Mon, 9 Nov 2015 07:02:43 +0900
Subject: [PATCH] fix: scenario

---
 app/assets/javascripts/editor/panel_editor/dock.js.coffee     |  1 +
 app/assets/javascripts/editor/panel_editor/scenario.js.coffee | 11 ++++++++++-
 app/assets/javascripts/views/balloons/element.js.coffee       |  2 +-
 app/models/panel_picture.rb                                   |  4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/editor/panel_editor/dock.js.coffee b/app/assets/javascripts/editor/panel_editor/dock.js.coffee
index f1e3b22c..2df7e39c 100644
--- 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
     attrs = @root_bay.save_data()
     _.extend(attrs, @element_bay.save_data())
+    $.extend(true, attrs, @scenario_bay.save_data()) # deep merge by jQuery
     # save json data by panel form
     @root_bay.body.form.save(attrs)
   
diff --git a/app/assets/javascripts/editor/panel_editor/scenario.js.coffee b/app/assets/javascripts/editor/panel_editor/scenario.js.coffee
index 366e0350..c58c188f 100644
--- 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)
   
   save_data: () ->
-    @body.form.save_data()
+    @body.save_data()
   
   length: () ->
     @body.length()
@@ -70,3 +70,12 @@ class Editor.EditorModule.DockModule.TabModule.ScenarioBayBody extends Editor.Ed
   length: () ->
     @elements.element_lis.length
   
+  save_data: () ->
+    attrs = {}
+    _.each @elements.element_lis, (element_li) ->
+      form = element_li.body.form
+      name = form.item.table_name() + '_attributes'
+      attrs[name] ||= []
+      attrs[name].push(form.save_data())
+    attrs
+  
diff --git a/app/assets/javascripts/views/balloons/element.js.coffee b/app/assets/javascripts/views/balloons/element.js.coffee
index b55600fc..bec504e6 100644
--- 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: () ->
     attr = {
       src: @system_picture.picture_file().src(), 
-      alt: @element.get('caption'),
+      alt: @speech_balloon.element.get('caption'),
       style: Pettanr.to_style(@style())
     }
     this.$el.attr(attr)
diff --git a/app/models/panel_picture.rb b/app/models/panel_picture.rb
index 2406f778..bf3463f8 100644
--- 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, 
-      :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
-- 
2.11.0