From 407ba1fcca6e0c39b1d5249d0ac4a6b3d9879c73 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 13 Feb 2019 12:57:02 +0300 Subject: [PATCH] Fix Bug 40401. Show Search dialog in find mode when open mailmerge preview, version history, review preview --- apps/common/main/lib/controller/ReviewChanges.js | 5 +++-- apps/documenteditor/main/app/controller/LeftMenu.js | 10 +++++++++- apps/documenteditor/main/app/view/MailMergeSettings.js | 2 ++ apps/documenteditor/main/app/view/SignatureSettings.js | 1 + .../presentationeditor/main/app/controller/LeftMenu.js | 9 ++++++++- .../main/app/view/SignatureSettings.js | 1 + apps/spreadsheeteditor/main/app/controller/LeftMenu.js | 9 ++++++++- .../main/app/view/SignatureSettings.js | 1 + 8 files changed, 33 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 6c148092b..66593ab3f 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -595,8 +595,9 @@ define([ if (comments) comments.setPreviewMode(disable); - var leftMenu = app.getController('LeftMenu').leftMenu; - leftMenu.getMenu('file').miProtect.setDisabled(disable); + var leftMenu = app.getController('LeftMenu'); + leftMenu.leftMenu.getMenu('file').miProtect.setDisabled(disable); + leftMenu.setPreviewMode(disable); if (this.view) { this.view.$el.find('.no-group-mask').css('opacity', 1); diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 405267131..95e98dd73 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -532,7 +532,7 @@ define([ } if (show) { - var mode = this.mode.isEdit ? (action || undefined) : 'no-replace'; + var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace'; if (this.dlgSearch.isVisible()) { this.dlgSearch.setMode(mode); this.dlgSearch.setSearchText(this.api.asc_GetSelectedText()); @@ -583,6 +583,13 @@ define([ } }, + setPreviewMode: function(mode) { + if (this.viewmode === mode) return; + this.viewmode = mode; + + this.dlgSearch && this.dlgSearch.setMode(this.viewmode ? 'no-replace' : 'search'); + }, + SetDisabled: function(disable, disableFileMenu) { this.mode.isEdit = !disable; if (disable) this.leftMenu.close(); @@ -592,6 +599,7 @@ define([ var comments = this.getApplication().getController('Common.Controllers.Comments'); if (comments) comments.setPreviewMode(disable); + this.setPreviewMode(disable); this.leftMenu.btnChat.setDisabled(disable); /** coauthoring end **/ this.leftMenu.btnPlugins.setDisabled(disable); diff --git a/apps/documenteditor/main/app/view/MailMergeSettings.js b/apps/documenteditor/main/app/view/MailMergeSettings.js index e8e6602bb..af1c3768f 100644 --- a/apps/documenteditor/main/app/view/MailMergeSettings.js +++ b/apps/documenteditor/main/app/view/MailMergeSettings.js @@ -810,6 +810,8 @@ define([ if (comments) comments.setPreviewMode(disable); + DE.getController('LeftMenu').setPreviewMode(disable); + this.lockControls(DE.enumLockMM.preview, disable, {array: [this.btnInsField, this.btnEditData]}); }, diff --git a/apps/documenteditor/main/app/view/SignatureSettings.js b/apps/documenteditor/main/app/view/SignatureSettings.js index e09be0ac2..ac95843c9 100644 --- a/apps/documenteditor/main/app/view/SignatureSettings.js +++ b/apps/documenteditor/main/app/view/SignatureSettings.js @@ -392,6 +392,7 @@ define([ // var leftMenu = DE.getController('LeftMenu').leftMenu; // leftMenu.btnComments.setDisabled(disable); + DE.getController('LeftMenu').setPreviewMode(disable); var comments = DE.getController('Common.Controllers.Comments'); if (comments) comments.setPreviewMode(disable); diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index 3c2ba656a..59a776d9b 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -419,7 +419,7 @@ define([ } if (show) { - var mode = this.mode.isEdit ? (action || undefined) : 'no-replace'; + var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace'; if (this.dlgSearch.isVisible()) { this.dlgSearch.setMode(mode); this.dlgSearch.focus(); @@ -464,6 +464,13 @@ define([ } }, + setPreviewMode: function(mode) { + if (this.viewmode === mode) return; + this.viewmode = mode; + + this.dlgSearch && this.dlgSearch.setMode(this.viewmode ? 'no-replace' : 'search'); + }, + onApiServerDisconnect: function(enableDownload) { this.mode.isEdit = false; this.leftMenu.close(); diff --git a/apps/presentationeditor/main/app/view/SignatureSettings.js b/apps/presentationeditor/main/app/view/SignatureSettings.js index 78f307873..bd40ef48f 100644 --- a/apps/presentationeditor/main/app/view/SignatureSettings.js +++ b/apps/presentationeditor/main/app/view/SignatureSettings.js @@ -345,6 +345,7 @@ define([ // var leftMenu = PE.getController('LeftMenu').leftMenu; // leftMenu.btnComments.setDisabled(disable); + PE.getController('LeftMenu').setPreviewMode(disable); var comments = PE.getController('Common.Controllers.Comments'); if (comments) comments.setPreviewMode(disable); diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 124df1cd1..47fe18f25 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -577,7 +577,7 @@ define([ } if (show) { - var mode = this.mode.isEdit ? (action || undefined) : 'no-replace'; + var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace'; if (this.dlgSearch.isVisible()) { this.dlgSearch.setMode(mode); @@ -633,6 +633,13 @@ define([ } }, + setPreviewMode: function(mode) { + if (this.viewmode === mode) return; + this.viewmode = mode; + + this.dlgSearch && this.dlgSearch.setMode(this.viewmode ? 'no-replace' : 'search'); + }, + onApiServerDisconnect: function(enableDownload) { this.mode.isEdit = false; this.leftMenu.close(); diff --git a/apps/spreadsheeteditor/main/app/view/SignatureSettings.js b/apps/spreadsheeteditor/main/app/view/SignatureSettings.js index 0350b38b7..b05e67694 100644 --- a/apps/spreadsheeteditor/main/app/view/SignatureSettings.js +++ b/apps/spreadsheeteditor/main/app/view/SignatureSettings.js @@ -391,6 +391,7 @@ define([ // var leftMenu = SSE.getController('LeftMenu').leftMenu; // leftMenu.btnComments.setDisabled(disable); + SSE.getController('LeftMenu').setPreviewMode(disable); var comments = SSE.getController('Common.Controllers.Comments'); if (comments) comments.setPreviewMode(disable);