From a981170ba4acc956cfca8df4b0dbe43ce65adf7c Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 31 May 2022 16:50:11 +0300 Subject: [PATCH 1/2] [DE] Fix closing of search by esc in mail merge mode --- apps/spreadsheeteditor/main/app/controller/LeftMenu.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 4b4099757..743e91266 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -742,11 +742,6 @@ define([ btnSearch.pressed && btnSearch.toggle(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 (Common.UI.HintManager.needCloseFileMenu()) this.leftMenu.menuFile.hide(); @@ -775,11 +770,14 @@ define([ return false; } 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'); - if (!this.api.isCellEdited && !menu_opened.length) { + if (!this.api.isCellEdited && !menu_opened.length && !isSearchOpen) { Common.Gateway.internalMessage('shortcut', {key:'escape'}); return false; } + isSearchOpen && searchBarBtn.toggle(false); } break; /** coauthoring begin **/ From acf7f5c9b75ed7d0630d447d9bbcdbc574b0bd41 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 31 May 2022 18:13:34 +0300 Subject: [PATCH 2/2] [DE PE SSE] Fix hint manager --- apps/common/main/lib/controller/HintManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/HintManager.js b/apps/common/main/lib/controller/HintManager.js index 81299f97d..548d6e048 100644 --- a/apps/common/main/lib/controller/HintManager.js +++ b/apps/common/main/lib/controller/HintManager.js @@ -134,7 +134,7 @@ Common.UI.HintManager = new(function() { return; } if (_isEditDiagram) { - _currentSection = [$(window.parent.document).find('.advanced-settings-dlg')[0], window.document]; + _currentSection = [$(window.parent.document).find('.advanced-settings-dlg:visible')[0], window.document]; } else if ($('#file-menu-panel').is(':visible')) { _currentSection = $('#file-menu-panel'); } else {