Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 33669.

Browse source
This commit is contained in:
Julia Radzhabova 2017-04-11 17:07:46 +03:00
parent af7233bc5b
commit d2f949fc39
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/component/Button.js
View file

@ -476,13 +476,15 @@ define([
setDisabled: function(disabled) { setDisabled: function(disabled) {
if (this.rendered && this.disabled != disabled) { if (this.rendered && this.disabled != disabled) {
var el = this.cmpEl, var el = this.cmpEl,
isGroup = el.hasClass('btn-group'); isGroup = el.hasClass('btn-group'),
me = this;
disabled = (disabled===true); disabled = (disabled===true);
if (disabled !== el.hasClass('disabled')) { if (disabled !== el.hasClass('disabled')) {
var decorateBtn = function(button) { var decorateBtn = function(button) {
button.toggleClass('disabled', disabled); button.toggleClass('disabled', disabled);
if (!me.options.allowMouseEventsOnDisabled)
(disabled) ? button.attr({disabled: disabled}) : button.removeAttr('disabled'); (disabled) ? button.attr({disabled: disabled}) : button.removeAttr('disabled');
}; };

21
apps/documenteditor/main/app/view/RightMenu.js
View file

@ -79,42 +79,48 @@ define([
asctype: Common.Utils.documentSettingsType.Paragraph, asctype: Common.Utils.documentSettingsType.Paragraph,
enableToggle: true, enableToggle: true,
disabled: true, disabled: true,
toggleGroup: 'tabpanelbtnsGroup' toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
}); });
this.btnTable = new Common.UI.Button({ this.btnTable = new Common.UI.Button({
hint: this.txtTableSettings, hint: this.txtTableSettings,
asctype: Common.Utils.documentSettingsType.Table, asctype: Common.Utils.documentSettingsType.Table,
enableToggle: true, enableToggle: true,
disabled: true, disabled: true,
toggleGroup: 'tabpanelbtnsGroup' toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
}); });
this.btnImage = new Common.UI.Button({ this.btnImage = new Common.UI.Button({
hint: this.txtImageSettings, hint: this.txtImageSettings,
asctype: Common.Utils.documentSettingsType.Image, asctype: Common.Utils.documentSettingsType.Image,
enableToggle: true, enableToggle: true,
disabled: true, disabled: true,
toggleGroup: 'tabpanelbtnsGroup' toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
}); });
this.btnHeaderFooter = new Common.UI.Button({ this.btnHeaderFooter = new Common.UI.Button({
hint: this.txtHeaderFooterSettings, hint: this.txtHeaderFooterSettings,
asctype: Common.Utils.documentSettingsType.Header, asctype: Common.Utils.documentSettingsType.Header,
enableToggle: true, enableToggle: true,
disabled: true, disabled: true,
toggleGroup: 'tabpanelbtnsGroup' toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
}); });
this.btnChart = new Common.UI.Button({ this.btnChart = new Common.UI.Button({
hint: this.txtChartSettings, hint: this.txtChartSettings,
asctype: Common.Utils.documentSettingsType.Chart, asctype: Common.Utils.documentSettingsType.Chart,
enableToggle: true, enableToggle: true,
disabled: true, disabled: true,
toggleGroup: 'tabpanelbtnsGroup' toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
}); });
this.btnShape = new Common.UI.Button({ this.btnShape = new Common.UI.Button({
hint: this.txtShapeSettings, hint: this.txtShapeSettings,
asctype: Common.Utils.documentSettingsType.Shape, asctype: Common.Utils.documentSettingsType.Shape,
enableToggle: true, enableToggle: true,
disabled: true, disabled: true,
toggleGroup: 'tabpanelbtnsGroup' toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
}); });
this.btnTextArt = new Common.UI.Button({ this.btnTextArt = new Common.UI.Button({
@ -122,7 +128,8 @@ define([
asctype: Common.Utils.documentSettingsType.TextArt, asctype: Common.Utils.documentSettingsType.TextArt,
enableToggle: true, enableToggle: true,
disabled: true, disabled: true,
toggleGroup: 'tabpanelbtnsGroup' toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
}); });
this._settings = []; this._settings = [];