From 29d3515dfa2dfb2936a3c6bdf3f1f4a8dae199d5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 18 Aug 2017 15:17:25 +0300 Subject: [PATCH] Fix Bug 35643. --- apps/common/main/lib/controller/Plugins.js | 8 +++---- apps/common/main/lib/view/Plugins.js | 22 ++++++++++++++----- .../main/app/controller/LeftMenu.js | 1 + apps/documenteditor/main/locale/en.json | 1 + .../main/app/controller/LeftMenu.js | 1 + apps/presentationeditor/main/locale/en.json | 1 + .../main/app/controller/LeftMenu.js | 1 + apps/spreadsheeteditor/main/locale/en.json | 1 + 8 files changed, 25 insertions(+), 11 deletions(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index b017a2c931..f961519686 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -288,8 +288,8 @@ define([ }); me.pluginDlg.show(); } - } else - this.panelPlugins.openNotVisualMode(plugin.get_Guid()); + } + this.panelPlugins.openedPluginMode(plugin.get_Guid()); }, onPluginClose: function(plugin) { @@ -297,9 +297,7 @@ define([ this.pluginDlg.close(); else if (this.panelPlugins.iframePlugin) this.panelPlugins.closeInsideMode(); - else { - this.panelPlugins.closeNotVisualMode(plugin.get_Guid()); - } + this.panelPlugins.closedPluginMode(plugin.get_Guid()); }, onPluginResize: function(size, minSize, maxSize, callback ) { diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js index cb23422d40..142200af1c 100644 --- a/apps/common/main/lib/view/Plugins.js +++ b/apps/common/main/lib/view/Plugins.js @@ -162,7 +162,7 @@ define([ split: modes && modes.length > 1, value: guid, hint: model.get('name') - }); + }); var $slot = $('').appendTo(_group); btn.render($slot); @@ -205,7 +205,7 @@ define([ if (!this.iframePlugin) { this.iframePlugin = document.createElement("iframe"); this.iframePlugin.id = 'plugin_iframe'; - this.iframePlugin.name = 'pluginFrameEditor', + this.iframePlugin.name = 'pluginFrameEditor'; this.iframePlugin.width = '100%'; this.iframePlugin.height = '100%'; this.iframePlugin.align = "top"; @@ -239,7 +239,7 @@ define([ this.fireEvent('plugin:open', [this, 'onboard', 'close']); }, - openNotVisualMode: function(pluginGuid) { + openedPluginMode: function(pluginGuid) { // var rec = this.viewPluginsList.store.findWhere({guid: pluginGuid}); // if ( rec ) { // this.viewPluginsList.cmpEl.find('#' + rec.get('id')).parent().addClass('selected'); @@ -248,16 +248,25 @@ define([ var model = this.storePlugins.findWhere({guid: pluginGuid}); if ( model ) { var _btn = model.get('button'); - _btn && _btn.toggle(true); + if (_btn) { + _btn.toggle(true); + if (_btn.menu && _btn.menu.items.length>0) { + _btn.menu.items[0].setCaption(this.textStop); + } + } } }, - closeNotVisualMode: function(guid) { + closedPluginMode: function(guid) { // this.viewPluginsList.cmpEl.find('.selected').removeClass('selected'); var model = this.storePlugins.findWhere({guid: guid}); if ( model ) { - model.get('button').toggle(false); + var _btn = model.get('button'); + _btn.toggle(false); + if (_btn.menu && _btn.menu.items.length>0) { + _btn.menu.items[0].setCaption(this.textStart); + } } }, @@ -306,6 +315,7 @@ define([ strPlugins: 'Plugins', textLoading: 'Loading', textStart: 'Start', + textStop: 'Stop', groupCaption: 'Plugins' }, Common.Views.Plugins || {})); diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index ae74814d98..0aa35e1d94 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -642,6 +642,7 @@ define([ onPluginOpen: function(panel, type, action) { if ( type == 'onboard' ) { if ( action == 'open' ) { + this.leftMenu.close(); this.leftMenu.panelPlugins.show(); this.leftMenu.onBtnMenuClick({pressed:true, options: {action: 'plugins'}}); } else { diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 702267e129..2463caeb6e 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -187,6 +187,7 @@ "Common.Views.Plugins.strPlugins": "Plugins", "Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textStart": "Start", + "Common.Views.Plugins.textStop": "Stop", "Common.Views.RenameDialog.cancelButtonText": "Cancel", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "File name", diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index 9897011533..d41162cdda 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -530,6 +530,7 @@ define([ onPluginOpen: function(panel, type, action) { if ( type == 'onboard' ) { if ( action == 'open' ) { + this.leftMenu.close(); this.leftMenu.btnThumbs.toggle(false, false); this.leftMenu.panelPlugins.show(); this.leftMenu.onBtnMenuClick({pressed:true, options: {action: 'plugins'}}); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 87dee7bfa7..1de5a06f9d 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -120,6 +120,7 @@ "Common.Views.Plugins.strPlugins": "Plugins", "Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textStart": "Start", + "Common.Views.Plugins.textStop": "Stop", "Common.Views.RenameDialog.cancelButtonText": "Cancel", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "File name", diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index b75ed230bd..aaaa613d70 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -736,6 +736,7 @@ define([ onPluginOpen: function(panel, type, action) { if ( type == 'onboard' ) { if ( action == 'open' ) { + this.leftMenu.close(); this.leftMenu.panelPlugins.show(); this.leftMenu.onBtnMenuClick({pressed:true, options: {action: 'plugins'}}); } else { diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 05d65a34f3..f7a6b2fb0b 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -106,6 +106,7 @@ "Common.Views.Plugins.strPlugins": "Plugins", "Common.Views.Plugins.textLoading": "Loading", "Common.Views.Plugins.textStart": "Start", + "Common.Views.Plugins.textStop": "Stop", "Common.Views.RenameDialog.cancelButtonText": "Cancel", "Common.Views.RenameDialog.okButtonText": "Ok", "Common.Views.RenameDialog.textName": "File name",