diff --git a/apps/documenteditor/main/app/controller/ViewTab.js b/apps/documenteditor/main/app/controller/ViewTab.js index 37c7ab8ce1..269fd28a3a 100644 --- a/apps/documenteditor/main/app/controller/ViewTab.js +++ b/apps/documenteditor/main/app/controller/ViewTab.js @@ -173,6 +173,9 @@ define([ me.view.chRulers.$el.closest('.group').remove(); me.view.chRulers.$el.remove(); me.view.$el.find('.separator-rulers').remove(); + } + + if (!config.isEdit || config.customization && config.customization.macros===false) { me.view.$el.find('#slot-btn-macros').closest('.group').prev().addBack().remove(); } diff --git a/apps/documenteditor/main/app/view/ViewTab.js b/apps/documenteditor/main/app/view/ViewTab.js index 5ba509c681..79f1f6a790 100644 --- a/apps/documenteditor/main/app/view/ViewTab.js +++ b/apps/documenteditor/main/app/view/ViewTab.js @@ -278,7 +278,7 @@ define([ }); this.lockedControls.push(this.chRulers); - if (this.appConfig.isEdit) { + if (this.appConfig.isEdit && !(this.appConfig.customization && this.appConfig.customization.macros===false)) { this.btnMacros = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-macros', diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js index c116411f8e..7a38657a94 100644 --- a/apps/presentationeditor/main/app/view/ViewTab.js +++ b/apps/presentationeditor/main/app/view/ViewTab.js @@ -396,7 +396,7 @@ define([ }); this.lockedControls.push(this.chLeftMenu); - if (this.appConfig.isEdit) { + if (this.appConfig.isEdit && !(this.appConfig.customization && this.appConfig.customization.macros===false)) { this.btnMacros = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-macros', @@ -546,6 +546,8 @@ define([ me.chRulers.hide(); me.btnGuides.$el.closest('.group').remove(); me.$el.find('#slot-btn-slide-master').closest('.group').next().addBack().remove(); + } + if (!config.isEdit || config.customization && config.customization.macros===false) { me.$el.find('#slot-btn-macros').closest('.group').prev().addBack().remove(); } if (config.isEdit || config.isRestrictedEdit) { diff --git a/apps/spreadsheeteditor/main/app/view/ViewTab.js b/apps/spreadsheeteditor/main/app/view/ViewTab.js index 2a8d1a316a..e761618f03 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewTab.js +++ b/apps/spreadsheeteditor/main/app/view/ViewTab.js @@ -300,16 +300,18 @@ define([ }); this.lockedControls.push(this.btnViewPageBreak); - this.btnMacros = new Common.UI.Button({ - cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-macros', - lock: [_set.selRangeEdit, _set.editFormula, _set.lostConnect, _set.disableOnStart], - caption: this.textMacros, - dataHint: '1', - dataHintDirection: 'bottom', - dataHintOffset: 'small' - }); - this.lockedControls.push(this.btnMacros); + if (!(this.appConfig.customization && this.appConfig.customization.macros===false)) { + this.btnMacros = new Common.UI.Button({ + cls: 'btn-toolbar x-huge icon-top', + iconCls: 'toolbar__icon btn-macros', + lock: [_set.selRangeEdit, _set.editFormula, _set.lostConnect, _set.disableOnStart], + caption: this.textMacros, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' + }); + this.lockedControls.push(this.btnMacros); + } } this.cmbZoom = new Common.UI.ComboBox({ @@ -483,6 +485,8 @@ define([ me.toolbar && me.toolbar.$el.find('.group.sheet-freeze').hide(); me.toolbar && me.toolbar.$el.find('.separator.sheet-freeze').hide(); me.toolbar && me.toolbar.$el.find('.group.sheet-gridlines').hide(); + } + if (!config.isEdit || config.customization && config.customization.macros===false) { me.toolbar.$el.find('#slot-btn-macros').closest('.group').prev().addBack().remove(); }