From 866d831ae27e133ca5c76f7cbb8b28cd4cd53cd1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 7 Sep 2022 23:02:43 +0300 Subject: [PATCH] Fix locking right panes --- .../main/app/view/ChartSettings.js | 14 +++++--------- .../main/app/view/ImageSettings.js | 18 ++++++++---------- .../main/app/view/ShapeSettings.js | 8 +++----- .../main/app/view/TableSettings.js | 2 +- .../main/app/view/ChartSettings.js | 6 ++---- .../main/app/view/ImageSettings.js | 8 ++++---- .../main/app/view/ImageSettings.js | 8 ++++---- 7 files changed, 27 insertions(+), 37 deletions(-) diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index 09b25f1fe..b88abbd84 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -131,10 +131,8 @@ define([ this.chartProps = props.get_ChartProperties(); value = props.get_SeveralCharts() || this._locked; - if (this._state.SeveralCharts!==value) { - this.btnEditData.setDisabled(value); - this._state.SeveralCharts=value; - } + this.btnEditData.setDisabled(value); + this._state.SeveralCharts=value; value = props.get_SeveralChartTypes(); if (this._state.SeveralCharts && value) { @@ -178,11 +176,9 @@ define([ value = props.get_CanBeFlow() && !this._locked; var fromgroup = props.get_FromGroup() || this._locked; - if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup) { - this.cmbWrapType.setDisabled(!value || fromgroup); - this._state.CanBeFlow=value; - this._state.FromGroup=fromgroup; - } + this.cmbWrapType.setDisabled(!value || fromgroup); + this._state.CanBeFlow=value; + this._state.FromGroup=fromgroup; value = props.get_Width(); if ( Math.abs(this._state.Width-value)>0.001 ) { diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index df4817e88..0e253f011 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -400,12 +400,10 @@ define([ var fromgroup = props.get_FromGroup() || this._locked; var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null, isPictureControl = !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) && !control_props.get_FormPr() || this._locked; - if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup || this._state.isPictureControl!==isPictureControl) { - this.cmbWrapType.setDisabled(!value || fromgroup || isPictureControl); - this._state.CanBeFlow=value; - this._state.FromGroup=fromgroup; - this._state.isPictureControl=isPictureControl; - } + this.cmbWrapType.setDisabled(!value || fromgroup || isPictureControl); + this._state.CanBeFlow=value; + this._state.FromGroup=fromgroup; + this._state.isPictureControl=isPictureControl; value = props.get_Width(); if ( Math.abs(this._state.Width-value)>0.001 ) { @@ -426,12 +424,12 @@ define([ if (this._state.isOleObject!==value) { this.btnSelectImage.setVisible(!value); this.btnEditObject.setVisible(value); - this.btnRotate270.setDisabled(value); - this.btnRotate90.setDisabled(value); - this.btnFlipV.setDisabled(value); - this.btnFlipH.setDisabled(value); this._state.isOleObject=value; } + this.btnRotate270.setDisabled(value || this._locked); + this.btnRotate90.setDisabled(value || this._locked); + this.btnFlipV.setDisabled(value || this._locked); + this.btnFlipH.setDisabled(value || this._locked); if (this._state.isOleObject) { var plugin = DE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid}); diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 58d01426b..a58e4cf4f 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -851,11 +851,9 @@ define([ value = props.get_CanBeFlow() && !this._locked; var fromgroup = props.get_FromGroup() || this._locked; - if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup) { - this.cmbWrapType.setDisabled(!value || fromgroup); - this._state.CanBeFlow=value; - this._state.FromGroup=fromgroup; - } + this.cmbWrapType.setDisabled(!value || fromgroup); + this._state.CanBeFlow=value; + this._state.FromGroup=fromgroup; // background colors var rec = null; diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js index 7b5b4bba1..161595d01 100644 --- a/apps/documenteditor/main/app/view/TableSettings.js +++ b/apps/documenteditor/main/app/view/TableSettings.js @@ -628,9 +628,9 @@ define([ value = props.get_RowsInHeader(); if ( this._state.RepeatRow!==value ) { this.chRepeatRow.setValue(!!value, true); - this.chRepeatRow.setDisabled(value === null); this._state.RepeatRow=value; } + this.chRepeatRow.setDisabled(this._state.RepeatRow === null || this._locked); } }, diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index b6475f081..cdd777f4f 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -114,10 +114,8 @@ define([ this.chartProps = props.get_ChartProperties(); var value = props.get_SeveralCharts() || this._locked; - if (this._state.SeveralCharts!==value) { - this.btnEditData.setDisabled(value); - this._state.SeveralCharts=value; - } + this.btnEditData.setDisabled(value); + this._state.SeveralCharts=value; value = props.get_SeveralChartTypes(); if (this._state.SeveralCharts && value) { diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index 9eb8ef3e9..e9cadb6ce 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -350,12 +350,12 @@ define([ if (this._state.isOleObject!==value) { this.btnSelectImage.setVisible(!value); this.btnEditObject.setVisible(value); - this.btnRotate270.setDisabled(value); - this.btnRotate90.setDisabled(value); - this.btnFlipV.setDisabled(value); - this.btnFlipH.setDisabled(value); this._state.isOleObject=value; } + this.btnRotate270.setDisabled(value || this._locked); + this.btnRotate90.setDisabled(value || this._locked); + this.btnFlipV.setDisabled(value || this._locked); + this.btnFlipH.setDisabled(value || this._locked); if (this._state.isOleObject) { var plugin = PE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid}); diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 65a3bbf86..d7d3eeae9 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -450,12 +450,12 @@ define([ if (this._state.isOleObject!==value) { this.btnSelectImage.setVisible(!value); this.btnEditObject.setVisible(value); - this.btnRotate270.setDisabled(value); - this.btnRotate90.setDisabled(value); - this.btnFlipV.setDisabled(value); - this.btnFlipH.setDisabled(value); this._state.isOleObject=value; } + this.btnRotate270.setDisabled(value || this._locked); + this.btnRotate90.setDisabled(value || this._locked); + this.btnFlipV.setDisabled(value || this._locked); + this.btnFlipH.setDisabled(value || this._locked); if (this._state.isOleObject) { var plugin = SSE.getCollection('Common.Collections.Plugins').findWhere({guid: pluginGuid});