fix:balloon edit

diff --git a/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee b/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee
index 4708570..d12a678 100644 (file)
--- a/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee
+++ b/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee
@@ -105,7 +105,7 @@ class Pettanr.CircleSpeechBalloon.BalloonModule
       x: 0,\r
       y: 0,\r
       width: @parsed_settings()['speech_balloon']['default_width'],\r
-      eight: @parsed_settings()['speech_balloon']['default_height'],\r
+      height: @parsed_settings()['speech_balloon']['default_height'],\r
       r: @parsed_settings()['speech_balloon']['default_r']\r
     })\r
     @select_system_picture()\r
@@ -166,7 +166,7 @@ class Pettanr.CircleSpeechBalloon.SpeechModule
       y: s['y_rate'],\r
       width: s['width_rate'],\r
       height: s['height_rate'],\r
-      quotes: '',\r
+      quotes: @parsed_settings()['speech_balloon']['quotes'],\r
       font_size: @parsed_settings()['speech_balloon']['default_font_size'],\r
       text_align: @parsed_settings()['speech_balloon']['default_text_align'],\r
       fore_color: @parsed_settings()['speech_balloon']['default_fore_color'],\r

diff --git a/app/assets/javascripts/addons/plain_speech_balloons/init.js.coffee b/app/assets/javascripts/addons/plain_speech_balloons/init.js.coffee
index ae5c73c..2564a88 100644 (file)
--- a/app/assets/javascripts/addons/plain_speech_balloons/init.js.coffee
+++ b/app/assets/javascripts/addons/plain_speech_balloons/init.js.coffee
@@ -104,7 +104,7 @@ class Pettanr.PlainSpeechBalloon.BalloonModule
       x: 0,\r
       y: 0,\r
       width: @parsed_settings()['speech_balloon']['default_width'],\r
-      eight: @parsed_settings()['speech_balloon']['default_height'],\r
+      height: @parsed_settings()['speech_balloon']['default_height'],\r
       r: 0\r
     })\r
     @select_system_picture()\r
@@ -156,7 +156,7 @@ class Pettanr.PlainSpeechBalloon.SpeechModule
       y: s['y_rate'],\r
       width: s['width_rate'],\r
       height: s['height_rate'],\r
-      quotes: '',\r
+      quotes: @parsed_settings()['speech_balloon']['quotes'],\r
       font_size: @parsed_settings()['speech_balloon']['default_font_size'],\r
       text_align: @parsed_settings()['speech_balloon']['default_text_align'],\r
       fore_color: @parsed_settings()['speech_balloon']['default_fore_color'],\r

diff --git a/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee b/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee
index f32d56a..de26c16 100644 (file)
--- a/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee
+++ b/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee
@@ -105,7 +105,7 @@ class Pettanr.SquareSpeechBalloon.BalloonModule
       x: 0,\r
       y: 0,\r
       width: @parsed_settings()['speech_balloon']['default_width'],\r
-      eight: @parsed_settings()['speech_balloon']['default_height'],\r
+      height: @parsed_settings()['speech_balloon']['default_height'],\r
       r: 0\r
     })\r
     @select_system_picture()\r
@@ -154,7 +154,7 @@ class Pettanr.SquareSpeechBalloon.SpeechModule
       y: s['y_rate'],\r
       width: s['width_rate'],\r
       height: s['height_rate'],\r
-      quotes: '',\r
+      quotes: @parsed_settings()['speech_balloon']['quotes'],\r
       font_size: @parsed_settings()['speech_balloon']['default_font_size'],\r
       text_align: @parsed_settings()['speech_balloon']['default_text_align'],\r
       fore_color: @parsed_settings()['speech_balloon']['default_fore_color']\r

diff --git a/app/assets/javascripts/editor/panel_editor/element.js.coffee b/app/assets/javascripts/editor/panel_editor/element.js.coffee
index 4a1b177..10c8314 100644 (file)
--- a/app/assets/javascripts/editor/panel_editor/element.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor/element.js.coffee
@@ -80,7 +80,7 @@ class Editor.EditorModule.DockModule.ElementBay extends Editor.EditorModule.Dock
         z = tab.label.z()\r
         z-- if z > new_tab_z  # from 0, 1, new tab, 3... to 1, 2, 3...\r
         tab.element.set({\r
-          z: z\r
+          z: z + 1\r
         }, {silent: true})\r
         tab.element.trigger('sort')\r
   \r

diff --git a/app/assets/javascripts/editor/panel_editor/element/element_board.js.coffee b/app/assets/javascripts/editor/panel_editor/element/element_board.js.coffee
index eaf9b1b..fa0b07b 100644 (file)
--- a/app/assets/javascripts/editor/panel_editor/element/element_board.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor/element/element_board.js.coffee
@@ -5,7 +5,7 @@ class Editor.EditorModule.DockModule.ElementBoard extends Editor.EditorModule.Do
     @element = options.element\r
   \r
   dom_id: () ->\r
-    super() + '-' + @element.get('id')  # use tab index\r
+    super() + '-' + @element.cid  # use tab index\r
   \r
 class Editor.EditorModule.DockModule.TabModule.ElementBoardLabel extends Editor.EditorModule.DockModule.TabModule.BoardLabel\r
   \r

diff --git a/app/assets/javascripts/models/balloon.js.coffee b/app/assets/javascripts/models/balloon.js.coffee
index 35faadd..94fb4b7 100644 (file)
--- a/app/assets/javascripts/models/balloon.js.coffee
+++ b/app/assets/javascripts/models/balloon.js.coffee
@@ -22,7 +22,6 @@ class Pettanr.Balloon extends Peta.Element
     {\r
       speech_balloon_template_id: speech_balloon_template.get('id'),\r
       speech_balloon_template_module_name: speech_balloon_template.get('module_name'),\r
-      speech_balloon_template_settings: speech_balloon_template.get('settings')\r
     }\r
   \r
   speech_balloon: () ->\r

diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee
index b1f8741..7b13d47 100644 (file)
--- a/app/assets/javascripts/models/panel.js.coffee
+++ b/app/assets/javascripts/models/panel.js.coffee
@@ -88,6 +88,7 @@ class Pettanr.Panel.WithElements extends Pettanr.Panel
     xhr = @sync(method, this, {\r
       attrs: {panel: attrs},\r
       success: (model, response, options) =>\r
+        _this.set(model, {silent: true})\r
         _this.trigger('save:success', _this, response)\r
       error: (model, response, options) =>\r
         _this.trigger('save:fail', _this, response)\r

diff --git a/app/assets/javascripts/models/speech.js.coffee b/app/assets/javascripts/models/speech.js.coffee
index 5f8a8a4..a91413d 100644 (file)
--- a/app/assets/javascripts/models/speech.js.coffee
+++ b/app/assets/javascripts/models/speech.js.coffee
@@ -22,10 +22,8 @@ class Pettanr.Speech extends Peta.Element
     {\r
       speech_balloon_template_id: speech_balloon_template.get('id'),\r
       speech_balloon_template_module_name: speech_balloon_template.get('module_name'),\r
-      speech_balloon_template_settings: speech_balloon_template.get('settings')\r
       writing_format_id: writing_format.get('id'),\r
       writing_format_module_name: writing_format.get('module_name'),\r
-      writing_format_template_settings: writing_format.get('settings')\r
     }\r
   \r
   speech_balloon: () ->\r

diff --git a/app/assets/javascripts/models/speech_balloon.js.coffee b/app/assets/javascripts/models/speech_balloon.js.coffee
index 07a77e6..f77322a 100644 (file)
--- a/app/assets/javascripts/models/speech_balloon.js.coffee
+++ b/app/assets/javascripts/models/speech_balloon.js.coffee
@@ -28,8 +28,7 @@ class Pettanr.SpeechBalloon extends Peta.Element
     speech_balloon_template = templates.speech_balloon_template\r
     {\r
       speech_balloon_template_id: speech_balloon_template.get('id'),\r
-      speech_balloon_template_module_name: speech_balloon_template.get('module_name'),\r
-      speech_balloon_template_settings: speech_balloon_template.get('settings')\r
+      speech_balloon_template_module_name: speech_balloon_template.get('module_name')\r
     }\r
   \r
   panel: () ->\r

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index ad67b3e..926acda 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -142,6 +142,7 @@ class PanelsController < ApplicationController
         updated_html_format format
         updated_json_format format
       else
+    p @item.errors
         format.html {
           flash[:notice] = I18n.t('flash.notice.not_updated', :model => @my_model_class.model_name.human)
           @editor = Editor::PanelEditor.new @item, @operators