From fd46abba46f092b780597d3b7d28d15e39dbec17 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 22 Nov 2021 14:42:28 +0300 Subject: [PATCH 1/4] [DE forms] Fix Bug 53869 --- .../forms/app/controller/ApplicationController.js | 9 --------- apps/documenteditor/forms/app/view/ApplicationView.js | 3 +-- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index d1e3ea34e..6e7ab0804 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -1445,8 +1445,6 @@ define([ this.textMenu.items[0].setDisabled(!cancopy); // copy this.textMenu.items[1].setDisabled(disabled || !cancopy); // cut this.textMenu.items[2].setDisabled(disabled) // paste; - this.textMenu.items[3].setVisible(this.appOptions.canPrint); - this.textMenu.items[3].setDisabled(!cancopy); this.showPopupMenu(this.textMenu, {}, event); } @@ -1470,13 +1468,6 @@ define([ } } break; - case 'print': - var printopt = new Asc.asc_CAdjustPrint(); - printopt.asc_setPrintType(Asc.c_oAscPrintType.Selection); - var opts = new Asc.asc_CDownloadOptions(null, Common.Utils.isChrome || Common.Utils.isSafari || Common.Utils.isOpera || Common.Utils.isGecko && Common.Utils.firefoxVersion>86); // if isChrome or isSafari or isOpera == true use asc_onPrintUrl event - opts.asc_setAdvancedOptions(printopt); - this.api.asc_Print(opts); - break; } }, diff --git a/apps/documenteditor/forms/app/view/ApplicationView.js b/apps/documenteditor/forms/app/view/ApplicationView.js index 1e5f79a3e..d820102e6 100644 --- a/apps/documenteditor/forms/app/view/ApplicationView.js +++ b/apps/documenteditor/forms/app/view/ApplicationView.js @@ -92,8 +92,7 @@ define([ items: [ { caption: this.textCut, value: 'cut', iconCls: 'mi-icon svg-icon cut' }, { caption: this.textCopy, value: 'copy', iconCls: 'mi-icon svg-icon copy' }, - { caption: this.textPaste, value: 'paste', iconCls: 'mi-icon svg-icon paste' }, - { caption: this.textPrintSel, value: 'print', iconCls: 'mi-icon svg-icon print' } + { caption: this.textPaste, value: 'paste', iconCls: 'mi-icon svg-icon paste' } ] }); }, From be52573ca186d18a3a691f51bf63f230d621d5e8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 22 Nov 2021 17:24:55 +0300 Subject: [PATCH 2/4] [SSE] Fix Bug 53952 --- apps/spreadsheeteditor/main/app/controller/Main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 18c1476c9..5cba900d2 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -2231,7 +2231,7 @@ define([ }, checkProtectedRange: function(callback, scope, args) { - var result = this.api.asc_isProtectedSheet() ? this.api.asc_checkProtectedRange() : false; + var result = this.api.asc_isProtectedSheet() && this.api.asc_checkLockedCells() ? this.api.asc_checkProtectedRange() : false; if (result===null) { this.onError(Asc.c_oAscError.ID.ChangeOnProtectedSheet, Asc.c_oAscError.Level.NoCritical); return; From dde0ad70239c6003a5b155148fb93acdf1bc46c2 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 22 Nov 2021 18:05:05 +0300 Subject: [PATCH 3/4] [DE] Fix Bug 53935 --- apps/documenteditor/main/app/view/FormSettings.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index dc3968673..ca588a3af 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -1219,19 +1219,20 @@ define([ this.txtNewValue.setValue(record.get('name')); this._state.listValue = record.get('name'); this._state.listIndex = undefined; - this.disableListButtons(false); + this.disableListButtons(); }, onDisconnect: function() { this.onKeyChanged(this.cmbKey, {value: ""}); }, - disableListButtons: function(disabled) { - if (disabled===undefined) - disabled = !this.list.getSelectedRec(); - this.btnListDelete.setDisabled(disabled || this._state.DisabledControls); - this.btnListUp.setDisabled(disabled || this._state.DisabledControls); - this.btnListDown.setDisabled(disabled || this._state.DisabledControls); + disableListButtons: function() { + var rec = this.list.getSelectedRec(), + idx = rec ? this.list.store.indexOf(rec) : -1; + + this.btnListDelete.setDisabled(idx<0 || this._state.DisabledControls); + this.btnListUp.setDisabled(idx<1 || this._state.DisabledControls); + this.btnListDown.setDisabled(idx<0 || idx>this.list.store.length-2 || this._state.DisabledControls); }, onImagePositionChange: function (type, field, newValue, oldValue) { From f01af017ad5ea4b962e3844d76da23553627ee7a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 22 Nov 2021 19:44:20 +0300 Subject: [PATCH 4/4] [SSE] For Bug 53952 --- .../main/app/controller/Main.js | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 5cba900d2..0a842a0d9 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -2250,18 +2250,20 @@ define([ handler: function (result, value) { if (result == 'ok') { if (me.api) { - if (me.api.asc_checkActiveCellPassword(value.drmOptions.asc_getPassword())) { - callback && setTimeout(function() { - callback.apply(scope, args); - }, 1); - } else { - Common.UI.warning({ - msg: me.errorWrongPassword, - callback: function() { - Common.NotificationCenter.trigger('edit:complete', me.toolbar); - } - }); - } + me.api.asc_checkActiveCellPassword(value.drmOptions.asc_getPassword(), function(res) { + if (res) { + callback && setTimeout(function() { + callback.apply(scope, args); + }, 1); + } else { + Common.UI.warning({ + msg: me.errorWrongPassword, + callback: function() { + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + }); + } + }); } } Common.NotificationCenter.trigger('edit:complete', me.toolbar);