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

Fix Bug 40401. Show Search dialog in find mode when open mailmerge preview, version history, review preview

Browse source
This commit is contained in:
Julia Radzhabova 2019-02-13 12:57:02 +03:00
parent 63a06b9d19
commit 407ba1fcca
8 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -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);

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

@ -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);

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

@ -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]});
},

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

@ -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);

9
apps/presentationeditor/main/app/controller/LeftMenu.js
View file

@ -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();

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

@ -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);

9
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -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();

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

@ -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);