pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 02:29:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 75786

Browse Source
This commit is contained in:
Julia.Radzhabova
2025-07-04 18:51:24 +03:00
parent 80be0c0f8d
commit 4fe42b1d8c
4 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/documenteditor/main/app/controller/ViewTab.js
View File

@ -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();
}

2
apps/documenteditor/main/app/view/ViewTab.js
View File

@ -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',

4
apps/presentationeditor/main/app/view/ViewTab.js
View File

@ -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) {

24
apps/spreadsheeteditor/main/app/view/ViewTab.js
View File

@ -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();
}