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

Merge pull request #1771 from ONLYOFFICE/fix/fix-bugs

Browse source 
Fix/fix bugs
This commit is contained in:
Julia Radzhabova 2022-05-31 20:47:10 +03:00 committed by GitHub
parent 1d2737224f acf7f5c9b7
commit 03cdfcfe56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/controller/HintManager.js
View file

@ -134,7 +134,7 @@ Common.UI.HintManager = new(function() {
return; return;
} }
if (_isEditDiagram) { 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')) { } else if ($('#file-menu-panel').is(':visible')) {
_currentSection = $('#file-menu-panel'); _currentSection = $('#file-menu-panel');
} else { } else {

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 **/