From fd7b6791545001e53f74f579b6150a0e2250240f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 21 Mar 2017 16:47:46 +0300 Subject: [PATCH] Fix Bug 33669. --- apps/common/main/lib/component/Button.js | 6 ++++-- .../documenteditor/main/app/view/RightMenu.js | 21 ++++++++++++------- .../main/app/view/RightMenu.js | 21 ++++++++++++------- .../main/app/view/RightMenu.js | 18 ++++++++++------ 4 files changed, 44 insertions(+), 22 deletions(-) diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index f70308a14..d1f97fba3 100644 --- a/apps/common/main/lib/component/Button.js +++ b/apps/common/main/lib/component/Button.js @@ -416,14 +416,16 @@ define([ setDisabled: function(disabled) { if (this.rendered && this.disabled != disabled) { var el = this.cmpEl, - isGroup = el.hasClass('btn-group'); + isGroup = el.hasClass('btn-group'), + me = this; disabled = (disabled===true); if (disabled !== el.hasClass('disabled')) { var decorateBtn = function(button) { button.toggleClass('disabled', disabled); - (disabled) ? button.attr({disabled: disabled}) : button.removeAttr('disabled'); + if (!me.options.allowMouseEventsOnDisabled) + (disabled) ? button.attr({disabled: disabled}) : button.removeAttr('disabled'); }; decorateBtn(el); diff --git a/apps/documenteditor/main/app/view/RightMenu.js b/apps/documenteditor/main/app/view/RightMenu.js index 2f76f37d2..018f957dd 100644 --- a/apps/documenteditor/main/app/view/RightMenu.js +++ b/apps/documenteditor/main/app/view/RightMenu.js @@ -79,42 +79,48 @@ define([ asctype: Common.Utils.documentSettingsType.Paragraph, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnTable = new Common.UI.Button({ hint: this.txtTableSettings, asctype: Common.Utils.documentSettingsType.Table, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnImage = new Common.UI.Button({ hint: this.txtImageSettings, asctype: Common.Utils.documentSettingsType.Image, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnHeaderFooter = new Common.UI.Button({ hint: this.txtHeaderFooterSettings, asctype: Common.Utils.documentSettingsType.Header, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnChart = new Common.UI.Button({ hint: this.txtChartSettings, asctype: Common.Utils.documentSettingsType.Chart, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnShape = new Common.UI.Button({ hint: this.txtShapeSettings, asctype: Common.Utils.documentSettingsType.Shape, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnTextArt = new Common.UI.Button({ @@ -122,7 +128,8 @@ define([ asctype: Common.Utils.documentSettingsType.TextArt, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this._settings = []; diff --git a/apps/presentationeditor/main/app/view/RightMenu.js b/apps/presentationeditor/main/app/view/RightMenu.js index c72fb3c0c..df3d42116 100644 --- a/apps/presentationeditor/main/app/view/RightMenu.js +++ b/apps/presentationeditor/main/app/view/RightMenu.js @@ -78,42 +78,48 @@ define([ asctype: Common.Utils.documentSettingsType.Paragraph, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnTable = new Common.UI.Button({ hint: this.txtTableSettings, asctype: Common.Utils.documentSettingsType.Table, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnImage = new Common.UI.Button({ hint: this.txtImageSettings, asctype: Common.Utils.documentSettingsType.Image, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnSlide = new Common.UI.Button({ hint: this.txtSlideSettings, asctype: Common.Utils.documentSettingsType.Slide, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnChart = new Common.UI.Button({ hint: this.txtChartSettings, asctype: Common.Utils.documentSettingsType.Chart, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnShape = new Common.UI.Button({ hint: this.txtShapeSettings, asctype: Common.Utils.documentSettingsType.Shape, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnTextArt = new Common.UI.Button({ @@ -121,7 +127,8 @@ define([ asctype: Common.Utils.documentSettingsType.TextArt, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this._settings = []; diff --git a/apps/spreadsheeteditor/main/app/view/RightMenu.js b/apps/spreadsheeteditor/main/app/view/RightMenu.js index 75ace3874..693e2f7a6 100644 --- a/apps/spreadsheeteditor/main/app/view/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/view/RightMenu.js @@ -77,28 +77,32 @@ define([ asctype: Common.Utils.documentSettingsType.Paragraph, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnImage = new Common.UI.Button({ hint: this.txtImageSettings, asctype: Common.Utils.documentSettingsType.Image, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnChart = new Common.UI.Button({ hint: this.txtChartSettings, asctype: Common.Utils.documentSettingsType.Chart, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnShape = new Common.UI.Button({ hint: this.txtShapeSettings, asctype: Common.Utils.documentSettingsType.Shape, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnTextArt = new Common.UI.Button({ @@ -106,7 +110,8 @@ define([ asctype: Common.Utils.documentSettingsType.TextArt, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this.btnTable = new Common.UI.Button({ @@ -114,7 +119,8 @@ define([ asctype: Common.Utils.documentSettingsType.Table, enableToggle: true, disabled: true, - toggleGroup: 'tabpanelbtnsGroup' + toggleGroup: 'tabpanelbtnsGroup', + allowMouseEventsOnDisabled: true }); this._settings = [];