Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 49127

Browse source
This commit is contained in:
Julia Radzhabova 2021-08-30 23:12:11 +03:00
parent 0906dd1885
commit 7523a0078f
6 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/documenteditor/main/app/controller/RightMenu.js
View file

@ -131,8 +131,8 @@ define([
this.rightmenu.fireEvent('editcomplete', this.rightmenu); this.rightmenu.fireEvent('editcomplete', this.rightmenu);
}, },
onFocusObject: function(SelectedObjects) { onFocusObject: function(SelectedObjects, forceSignature) {
if (!this.editMode) if (!this.editMode && !forceSignature)
return; return;
var open = this._initSettings ? !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu) : false; var open = this._initSettings ? !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu) : false;
@ -269,6 +269,7 @@ define([
if (priorityactive>-1) active = priorityactive; if (priorityactive>-1) active = priorityactive;
else if (lastactive>=0 && currentactive<0) active = lastactive; else if (lastactive>=0 && currentactive<0) active = lastactive;
else if (currentactive>=0) active = currentactive; else if (currentactive>=0) active = currentactive;
else if (forceSignature && !this._settings[Common.Utils.documentSettingsType.Signature].hidden) active = Common.Utils.documentSettingsType.Signature;
else if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden) active = Common.Utils.documentSettingsType.MailMerge; else if (!this._settings[Common.Utils.documentSettingsType.MailMerge].hidden) active = Common.Utils.documentSettingsType.MailMerge;
if (active == undefined && open && lastactive>=0) if (active == undefined && open && lastactive>=0)
@ -423,8 +424,9 @@ define([
} }
this.rightmenu.chartSettings.disableControls(disabled); this.rightmenu.chartSettings.disableControls(disabled);
if (!allowSignature && this.rightmenu.signatureSettings) { if (this.rightmenu.signatureSettings) {
this.rightmenu.btnSignature.setDisabled(disabled); !allowSignature && this.rightmenu.btnSignature.setDisabled(disabled);
allowSignature && disabled && this.onFocusObject([], true); // force press signature button
} }
if (disabled) { if (disabled) {

2
apps/documenteditor/main/app/view/SignatureSettings.js
View file

@ -400,7 +400,7 @@ define([
allowMerge: false, allowMerge: false,
allowSignature: true, allowSignature: true,
allowProtect: true, allowProtect: true,
rightMenu: {clear: disable && (DE.getController('RightMenu').rightmenu.GetActivePane() !== 'id-signature-settings'), disable: true}, rightMenu: {clear: false, disable: true},
statusBar: true, statusBar: true,
leftMenu: {disable: false, previewMode: true}, leftMenu: {disable: false, previewMode: true},
fileMenu: false, fileMenu: false,

10
apps/presentationeditor/main/app/controller/RightMenu.js
View file

@ -106,8 +106,8 @@ define([
this.rightmenu.fireEvent('editcomplete', this.rightmenu); this.rightmenu.fireEvent('editcomplete', this.rightmenu);
}, },
onFocusObject: function(SelectedObjects) { onFocusObject: function(SelectedObjects, forceSignature) {
if (!this.editMode) if (!this.editMode && !forceSignature)
return; return;
var open = this._initSettings ? !Common.localStorage.getBool("pe-hide-right-settings", this.rightmenu.defaultHideRightMenu) : false; var open = this._initSettings ? !Common.localStorage.getBool("pe-hide-right-settings", this.rightmenu.defaultHideRightMenu) : false;
@ -194,6 +194,7 @@ define([
if (priorityactive>-1) active = priorityactive; if (priorityactive>-1) active = priorityactive;
else if (currentactive>=0) active = currentactive; else if (currentactive>=0) active = currentactive;
else if (lastactive>=0) active = lastactive; else if (lastactive>=0) active = lastactive;
else if (forceSignature && !this._settings[Common.Utils.documentSettingsType.Signature].hidden) active = Common.Utils.documentSettingsType.Signature;
else active = Common.Utils.documentSettingsType.Slide; else active = Common.Utils.documentSettingsType.Slide;
if (active !== undefined) { if (active !== undefined) {
@ -226,8 +227,9 @@ define([
this.rightmenu.imageSettings.disableControls(disabled); this.rightmenu.imageSettings.disableControls(disabled);
this.rightmenu.chartSettings.disableControls(disabled); this.rightmenu.chartSettings.disableControls(disabled);
if (!allowSignature && this.rightmenu.signatureSettings) { if (this.rightmenu.signatureSettings) {
this.rightmenu.btnSignature.setDisabled(disabled); !allowSignature && this.rightmenu.btnSignature.setDisabled(disabled);
allowSignature && disabled && this.onFocusObject([], true); // force press signature button
} }
if (disabled) { if (disabled) {

2
apps/presentationeditor/main/app/view/SignatureSettings.js
View file

@ -350,7 +350,7 @@ define([
Common.NotificationCenter.trigger('editing:disable', disable, { Common.NotificationCenter.trigger('editing:disable', disable, {
viewMode: disable, viewMode: disable,
allowSignature: true, allowSignature: true,
rightMenu: {clear: disable && (PE.getController('RightMenu').rightmenu.GetActivePane() !== 'id-signature-settings'), disable: true}, rightMenu: {clear: false, disable: true},
statusBar: true, statusBar: true,
leftMenu: {disable: false, previewMode: true}, leftMenu: {disable: false, previewMode: true},
fileMenu: false, fileMenu: false,

24
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -168,14 +168,14 @@ define([
this.onFocusObject(SelectedObjects, cellInfo, formatTableInfo, sparkLineInfo, pivotInfo); this.onFocusObject(SelectedObjects, cellInfo, formatTableInfo, sparkLineInfo, pivotInfo);
}, },
onFocusObject: function(SelectedObjects, cellInfo, formatTableInfo, sparkLineInfo, pivotInfo) { onFocusObject: function(SelectedObjects, cellInfo, formatTableInfo, sparkLineInfo, pivotInfo, forceSignature) {
if (!this.editMode) if (!this.editMode && !forceSignature)
return; return;
var isCellLocked = cellInfo.asc_getLocked() || this._state.wsProps['FormatCells'], var isCellLocked = cellInfo && cellInfo.asc_getLocked() || this._state.wsProps['FormatCells'],
isTableLocked = (cellInfo.asc_getLockedTable()===true || !this.rightmenu.mode.canModifyFilter) || this._state.wsProps['FormatCells'], isTableLocked = (cellInfo && cellInfo.asc_getLockedTable()===true || !this.rightmenu.mode.canModifyFilter) || this._state.wsProps['FormatCells'],
isSparkLocked = (cellInfo.asc_getLockedSparkline()===true) || this._state.wsLock, isSparkLocked = (cellInfo && cellInfo.asc_getLockedSparkline()===true) || this._state.wsLock,
isPivotLocked = (cellInfo.asc_getLockedPivotTable()===true) || this._state.wsProps['PivotTables']; isPivotLocked = (cellInfo && cellInfo.asc_getLockedPivotTable()===true) || this._state.wsProps['PivotTables'];
for (var i=0; i<this._settings.length; ++i) { for (var i=0; i<this._settings.length; ++i) {
if (i==Common.Utils.documentSettingsType.Signature) continue; if (i==Common.Utils.documentSettingsType.Signature) continue;
@ -241,7 +241,7 @@ define([
this._settings[settingsType].hidden = 0; this._settings[settingsType].hidden = 0;
} }
if (SelectedObjects.length<=0) { // cell is selected if (SelectedObjects.length<=0 && cellInfo) { // cell is selected
settingsType = Common.Utils.documentSettingsType.Cell; settingsType = Common.Utils.documentSettingsType.Cell;
this._settings[settingsType].props = cellInfo; this._settings[settingsType].props = cellInfo;
this._settings[settingsType].locked = isCellLocked; this._settings[settingsType].locked = isCellLocked;
@ -296,6 +296,7 @@ define([
if (priorityactive>-1) active = priorityactive; if (priorityactive>-1) active = priorityactive;
else if (lastactive>=0 && currentactive<0) active = lastactive; else if (lastactive>=0 && currentactive<0) active = lastactive;
else if (currentactive>=0) active = currentactive; else if (currentactive>=0) active = currentactive;
else if (forceSignature && !this._settings[Common.Utils.documentSettingsType.Signature].hidden) active = Common.Utils.documentSettingsType.Signature;
if (active == undefined && this._openRightMenu && lastactive>=0) if (active == undefined && this._openRightMenu && lastactive>=0)
active = lastactive; active = lastactive;
@ -425,12 +426,9 @@ define([
this.rightmenu.cellSettings.disableControls(disabled); this.rightmenu.cellSettings.disableControls(disabled);
this.rightmenu.slicerSettings.disableControls(disabled); this.rightmenu.slicerSettings.disableControls(disabled);
if (!allowSignature && this.rightmenu.signatureSettings) { if (this.rightmenu.signatureSettings) {
this.rightmenu.btnSignature.setDisabled(disabled); !allowSignature && this.rightmenu.btnSignature.setDisabled(disabled);
} allowSignature && disabled && this.onFocusObject([], undefined, undefined, undefined, undefined, true); // force press signature button
if (!allowSignature && this.rightmenu.signatureSettings) {
this.rightmenu.btnSignature.setDisabled(disabled);
} }
if (disabled) { if (disabled) {

2
apps/spreadsheeteditor/main/app/view/SignatureSettings.js
View file

@ -397,7 +397,7 @@ define([
viewMode: disable, viewMode: disable,
allowSignature: true, allowSignature: true,
allowProtect: true, allowProtect: true,
rightMenu: {clear: disable && (SSE.getController('RightMenu').rightmenu.GetActivePane() !== 'id-signature-settings'), disable: true}, rightMenu: {clear: false, disable: true},
statusBar: true, statusBar: true,
leftMenu: {disable: false, previewMode: true}, leftMenu: {disable: false, previewMode: true},
fileMenu: false, fileMenu: false,