From e17fa5ffeac689c6299976f6a2e0c21f77184e18 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 10 Nov 2017 17:11:58 +0300 Subject: [PATCH] Don't close signature settings when document has been signed. --- apps/documenteditor/main/app/view/SignatureSettings.js | 6 ++++-- apps/presentationeditor/main/app/view/SignatureSettings.js | 6 ++++-- apps/spreadsheeteditor/main/app/view/SignatureSettings.js | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/view/SignatureSettings.js b/apps/documenteditor/main/app/view/SignatureSettings.js index 2a6741de2..8d2e0613f 100644 --- a/apps/documenteditor/main/app/view/SignatureSettings.js +++ b/apps/documenteditor/main/app/view/SignatureSettings.js @@ -327,9 +327,11 @@ define([ if (this._state.DisabledEditing != disable) { this._state.DisabledEditing = disable; - disable && DE.getController('RightMenu').getView('RightMenu').clearSelection(); + var rightMenuController = DE.getController('RightMenu'); + if (disable && rightMenuController.rightmenu.GetActivePane() !== 'id-signature-settings') + rightMenuController.rightmenu.clearSelection(); + rightMenuController.SetDisabled(disable, false, true); DE.getController('Toolbar').DisableToolbar(disable, disable); - DE.getController('RightMenu').SetDisabled(disable, false, true); DE.getController('Statusbar').getView('Statusbar').SetDisabled(disable); DE.getController('Common.Controllers.ReviewChanges').SetDisabled(disable); DE.getController('DocumentHolder').getView().SetDisabled(disable); diff --git a/apps/presentationeditor/main/app/view/SignatureSettings.js b/apps/presentationeditor/main/app/view/SignatureSettings.js index 5f3f943c3..242b38386 100644 --- a/apps/presentationeditor/main/app/view/SignatureSettings.js +++ b/apps/presentationeditor/main/app/view/SignatureSettings.js @@ -245,8 +245,10 @@ define([ if (this._state.DisabledEditing != disable) { this._state.DisabledEditing = disable; - disable && PE.getController('RightMenu').getView('RightMenu').clearSelection(); - PE.getController('RightMenu').SetDisabled(disable, true); + var rightMenuController = PE.getController('RightMenu'); + if (disable && rightMenuController.rightmenu.GetActivePane() !== 'id-signature-settings') + rightMenuController.rightmenu.clearSelection(); + rightMenuController.SetDisabled(disable, true); PE.getController('Toolbar').DisableToolbar(disable, disable); PE.getController('Statusbar').getView('Statusbar').SetDisabled(disable); PE.getController('Common.Controllers.ReviewChanges').SetDisabled(disable); diff --git a/apps/spreadsheeteditor/main/app/view/SignatureSettings.js b/apps/spreadsheeteditor/main/app/view/SignatureSettings.js index 625126e66..fe96271f5 100644 --- a/apps/spreadsheeteditor/main/app/view/SignatureSettings.js +++ b/apps/spreadsheeteditor/main/app/view/SignatureSettings.js @@ -327,9 +327,11 @@ define([ if (this._state.DisabledEditing != disable) { this._state.DisabledEditing = disable; - disable && SSE.getController('RightMenu').getView('RightMenu').clearSelection(); + var rightMenuController = SSE.getController('RightMenu'); + if (disable && rightMenuController.rightmenu.GetActivePane() !== 'id-signature-settings') + rightMenuController.rightmenu.clearSelection(); + rightMenuController.SetDisabled(disable, true); SSE.getController('Toolbar').DisableToolbar(disable, disable); - SSE.getController('RightMenu').SetDisabled(disable, true); SSE.getController('Common.Controllers.ReviewChanges').SetDisabled(disable); SSE.getController('DocumentHolder').SetDisabled(disable); SSE.getController('Statusbar').SetDisabled(disable);