[PE] Fix the locking of the slide background settings buttons

ONLYOFFICE · Feb 7, 2024 · ca1d57e · ca1d57e
1 parent 71a4653
commit ca1d57e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/apps/presentationeditor/main/app/controller/RightMenu.js b/apps/presentationeditor/main/app/controller/RightMenu.js
@@ -159,7 +159,6 @@ define([
                     this._settings[settingsType].lockedBackground = value.get_LockBackground();
                     /*this._settings[settingsType].lockedEffects = value.get_LockTransition();
                     this._settings[settingsType].lockedTransition = value.get_LockTransition();*/
-                    this._settings[settingsType].lockedHeader = !!value.get_LockHeader && value.get_LockHeader();
                 } else {
                     this._settings[settingsType].locked = value.get_Locked();
                     if (settingsType == Common.Utils.documentSettingsType.Shape) {

diff --git a/apps/presentationeditor/main/app/view/SlideSettings.js b/apps/presentationeditor/main/app/view/SlideSettings.js
@@ -1202,7 +1202,7 @@ define([
         ChangeSettings: function(props) {
             if (this._initSettings)
                 this.createDelayedElements();
-            this.SetSlideDisabled(this._locked.background, this._locked.header);
+            this.SetSlideDisabled(this._locked.background, this._locked.header, props);
 
             if (props)
             {
@@ -1480,9 +1480,6 @@ define([
                     this._state.GradColor = color;
                 }
 
-                this.btnBackgroundReset.setDisabled(!!props.get_LockResetBackground());
-                this.btnApplyAllSlides.setDisabled(!!props.get_LockApplyBackgroundToAll());
-
                 this.chBackgroundGraphics.setValue(!!props.get_ShowMasterSp(), true);
 
                 value = this.api.asc_getHeaderFooterProperties();
@@ -1502,12 +1499,17 @@ define([
             };
         },
 
-        SetSlideDisabled: function(background, header) {
+        SetSlideDisabled: function(background, header, props) {
             this._locked = {
                 background: background, header: header
             };
             if (this._initSettings) return;
 
+            if(props) {
+                this.btnBackgroundReset.setDisabled(!!props.get_LockResetBackground() || background);
+                this.btnApplyAllSlides.setDisabled(!!props.get_LockApplyBackgroundToAll());
+            }
+
             if (background !== this._stateDisabled.background) {
                 this.cmbFillSrc.setDisabled(background);
                 for (var i=0; i<this.FillItems.length; i++) {