From d7efc0f68adc2d5aac765213b3358b982b0a0700 Mon Sep 17 00:00:00 2001 From: yasushiito Date: Wed, 22 Apr 2015 08:56:25 +0900 Subject: [PATCH] fix:balloon edit --- app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee | 4 ++-- app/assets/javascripts/addons/plain_speech_balloons/init.js.coffee | 4 ++-- app/assets/javascripts/addons/square_speech_balloons/init.js.coffee | 4 ++-- app/assets/javascripts/editor/panel_editor/element.js.coffee | 2 +- .../javascripts/editor/panel_editor/element/element_board.js.coffee | 2 +- app/assets/javascripts/models/balloon.js.coffee | 1 - app/assets/javascripts/models/panel.js.coffee | 1 + app/assets/javascripts/models/speech.js.coffee | 2 -- app/assets/javascripts/models/speech_balloon.js.coffee | 3 +-- app/controllers/panels_controller.rb | 1 + 10 files changed, 11 insertions(+), 13 deletions(-) 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 47085708..d12a6788 100644 --- 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, y: 0, width: @parsed_settings()['speech_balloon']['default_width'], - eight: @parsed_settings()['speech_balloon']['default_height'], + height: @parsed_settings()['speech_balloon']['default_height'], r: @parsed_settings()['speech_balloon']['default_r'] }) @select_system_picture() @@ -166,7 +166,7 @@ class Pettanr.CircleSpeechBalloon.SpeechModule y: s['y_rate'], width: s['width_rate'], height: s['height_rate'], - quotes: '', + quotes: @parsed_settings()['speech_balloon']['quotes'], font_size: @parsed_settings()['speech_balloon']['default_font_size'], text_align: @parsed_settings()['speech_balloon']['default_text_align'], fore_color: @parsed_settings()['speech_balloon']['default_fore_color'], 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 ae5c73cc..2564a887 100644 --- 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, y: 0, width: @parsed_settings()['speech_balloon']['default_width'], - eight: @parsed_settings()['speech_balloon']['default_height'], + height: @parsed_settings()['speech_balloon']['default_height'], r: 0 }) @select_system_picture() @@ -156,7 +156,7 @@ class Pettanr.PlainSpeechBalloon.SpeechModule y: s['y_rate'], width: s['width_rate'], height: s['height_rate'], - quotes: '', + quotes: @parsed_settings()['speech_balloon']['quotes'], font_size: @parsed_settings()['speech_balloon']['default_font_size'], text_align: @parsed_settings()['speech_balloon']['default_text_align'], fore_color: @parsed_settings()['speech_balloon']['default_fore_color'], 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 f32d56a6..de26c169 100644 --- 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, y: 0, width: @parsed_settings()['speech_balloon']['default_width'], - eight: @parsed_settings()['speech_balloon']['default_height'], + height: @parsed_settings()['speech_balloon']['default_height'], r: 0 }) @select_system_picture() @@ -154,7 +154,7 @@ class Pettanr.SquareSpeechBalloon.SpeechModule y: s['y_rate'], width: s['width_rate'], height: s['height_rate'], - quotes: '', + quotes: @parsed_settings()['speech_balloon']['quotes'], font_size: @parsed_settings()['speech_balloon']['default_font_size'], text_align: @parsed_settings()['speech_balloon']['default_text_align'], fore_color: @parsed_settings()['speech_balloon']['default_fore_color'] diff --git a/app/assets/javascripts/editor/panel_editor/element.js.coffee b/app/assets/javascripts/editor/panel_editor/element.js.coffee index 4a1b1779..10c83140 100644 --- 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() z-- if z > new_tab_z # from 0, 1, new tab, 3... to 1, 2, 3... tab.element.set({ - z: z + z: z + 1 }, {silent: true}) tab.element.trigger('sort') 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 eaf9b1b0..fa0b07ba 100644 --- 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 dom_id: () -> - super() + '-' + @element.get('id') # use tab index + super() + '-' + @element.cid # use tab index class Editor.EditorModule.DockModule.TabModule.ElementBoardLabel extends Editor.EditorModule.DockModule.TabModule.BoardLabel diff --git a/app/assets/javascripts/models/balloon.js.coffee b/app/assets/javascripts/models/balloon.js.coffee index 35faadd4..94fb4b75 100644 --- 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 { speech_balloon_template_id: speech_balloon_template.get('id'), speech_balloon_template_module_name: speech_balloon_template.get('module_name'), - speech_balloon_template_settings: speech_balloon_template.get('settings') } speech_balloon: () -> diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee index b1f87413..7b13d472 100644 --- 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, { attrs: {panel: attrs}, success: (model, response, options) => + _this.set(model, {silent: true}) _this.trigger('save:success', _this, response) error: (model, response, options) => _this.trigger('save:fail', _this, response) diff --git a/app/assets/javascripts/models/speech.js.coffee b/app/assets/javascripts/models/speech.js.coffee index 5f8a8a40..a91413d0 100644 --- 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 { speech_balloon_template_id: speech_balloon_template.get('id'), speech_balloon_template_module_name: speech_balloon_template.get('module_name'), - speech_balloon_template_settings: speech_balloon_template.get('settings') writing_format_id: writing_format.get('id'), writing_format_module_name: writing_format.get('module_name'), - writing_format_template_settings: writing_format.get('settings') } speech_balloon: () -> diff --git a/app/assets/javascripts/models/speech_balloon.js.coffee b/app/assets/javascripts/models/speech_balloon.js.coffee index 07a77e6d..f77322a0 100644 --- 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 { speech_balloon_template_id: speech_balloon_template.get('id'), - speech_balloon_template_module_name: speech_balloon_template.get('module_name'), - speech_balloon_template_settings: speech_balloon_template.get('settings') + speech_balloon_template_module_name: speech_balloon_template.get('module_name') } panel: () -> diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb index ad67b3e5..926acda9 100644 --- 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 -- 2.11.0