From c2d5af84c8eca97ff63b8b576fc9596a9b928795 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Wed, 12 Jan 2022 01:32:04 +0300 Subject: [PATCH] [DE] Fix disabling of dark document button in view tab --- apps/documenteditor/main/app/controller/Toolbar.js | 2 ++ apps/documenteditor/main/app/view/ViewTab.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index da2f99dc2..1f066fe0e 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2910,6 +2910,7 @@ define([ this.toolbar.btnRedo.setDisabled(this._state.can_redo!==true); this.toolbar.btnCopy.setDisabled(this._state.can_copycut!==true); this.toolbar.btnPrint.setDisabled(!this.toolbar.mode.canPrint); + this.toolbar.btnDarkDocument && this.toolbar.btnDarkDocument.setDisabled(!Common.UI.Themes.isDarkTheme()); if (!this._state.mmdisable) { this.toolbar.btnMailRecepients.setDisabled(false); this.toolbar.mnuMailRecepients.items[2].setVisible(this.toolbar.mode.fileChoiceUrl || this.toolbar.mode.canRequestMailMergeRecipients); @@ -3240,6 +3241,7 @@ define([ var viewtab = me.getApplication().getController('ViewTab'); viewtab.setApi(me.api).setConfig({toolbar: me, mode: config}); Array.prototype.push.apply(me.toolbar.toolbarControls, viewtab.getView('ViewTab').getButtons()); + me.toolbar.btnDarkDocument = viewtab.getView('ViewTab').btnDarkDocument; } if ( config.isEdit && config.canFeatureContentControl && config.canFeatureForms || config.isRestrictedEdit && config.canFillForms ) { if (config.isFormCreator) { diff --git a/apps/documenteditor/main/app/view/ViewTab.js b/apps/documenteditor/main/app/view/ViewTab.js index ce54da4e9..1460cdac1 100644 --- a/apps/documenteditor/main/app/view/ViewTab.js +++ b/apps/documenteditor/main/app/view/ViewTab.js @@ -178,7 +178,6 @@ define([ dataHintDirection: 'bottom', dataHintOffset: 'small' }); - this.lockedControls.push(this.btnDarkDocument); this.chStatusbar = new Common.UI.CheckBox({ el: $host.findById('#slot-chk-statusbar'), @@ -235,6 +234,7 @@ define([ button.setDisabled(state); } }, this); + this.btnDarkDocument && this.btnDarkDocument.setDisabled(state); }, turnNavigation: function (state) {