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

[DE] Fix closing of search by esc in mail merge mode

Browse source
This commit is contained in:
JuliaSvinareva 2022-05-31 16:50:11 +03:00
parent 1d2737224f
commit a981170ba4
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -742,11 +742,6 @@ define([
btnSearch.pressed && btnSearch.toggle(false); btnSearch.pressed && btnSearch.toggle(false);
this.leftMenu._state.isSearchOpen && (this.leftMenu._state.isSearchOpen = false); this.leftMenu._state.isSearchOpen && (this.leftMenu._state.isSearchOpen = false);
if (this.mode.isEditMailMerge || this.mode.isEditOle) {
btnSearch = this.getApplication().getController('Toolbar').toolbar.btnSearch;
btnSearch.pressed && btnSearch.toggle(false);
}
if ( this.leftMenu.menuFile.isVisible() ) { if ( this.leftMenu.menuFile.isVisible() ) {
if (Common.UI.HintManager.needCloseFileMenu()) if (Common.UI.HintManager.needCloseFileMenu())
this.leftMenu.menuFile.hide(); this.leftMenu.menuFile.hide();
@ -775,11 +770,14 @@ define([
return false; return false;
} }
if (this.mode.isEditDiagram || this.mode.isEditMailMerge || this.mode.isEditOle) { if (this.mode.isEditDiagram || this.mode.isEditMailMerge || this.mode.isEditOle) {
var searchBarBtn = (this.mode.isEditMailMerge || this.mode.isEditOle) && this.getApplication().getController('Toolbar').toolbar.btnSearch,
isSearchOpen = searchBarBtn && searchBarBtn.pressed;
menu_opened = $(document.body).find('.open > .dropdown-menu'); menu_opened = $(document.body).find('.open > .dropdown-menu');
if (!this.api.isCellEdited && !menu_opened.length) { if (!this.api.isCellEdited && !menu_opened.length && !isSearchOpen) {
Common.Gateway.internalMessage('shortcut', {key:'escape'}); Common.Gateway.internalMessage('shortcut', {key:'escape'});
return false; return false;
} }
isSearchOpen && searchBarBtn.toggle(false);
} }
break; break;
/** coauthoring begin **/ /** coauthoring begin **/