pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-23 23:47:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bug 63918, Bug 63644

Browse Source
This commit is contained in:
Julia Radzhabova
2024-02-14 18:55:40 +03:00
parent 5f21ec6d99
commit 21ef4650b2
8 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/common/main/lib/view/Chat.js
View File

@ -172,9 +172,6 @@ define([
if ((event.ctrlKey || event.metaKey) && !event.altKey) {
this._onBtnAddMessage(event);
}
} else
if (event.keyCode == Common.UI.Keys.ESC && !Common.UI.HintManager.isHintVisible()) {
this.hide();
}
},

2
apps/documenteditor/main/app/controller/DocumentHolder.js
View File

@ -726,8 +726,6 @@ define([
if (key == Common.UI.Keys.ESC) {
Common.UI.Menu.Manager.hideAll();
if (!Common.UI.HintManager.isHintVisible())
Common.NotificationCenter.trigger('leftmenu:change', 'hide');
}
}
},

2
apps/documenteditor/main/app/controller/LeftMenu.js
View File

@ -851,7 +851,7 @@ define([
return false;
}
}
if (this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() || $(e.target).parents('#left-menu').length ) {
if (this.leftMenu.btnAbout.pressed) {
if (!Common.UI.HintManager.isHintVisible()) {
this.leftMenu.close();
Common.NotificationCenter.trigger('layout:changed', 'leftmenu');

2
apps/pdfeditor/main/app/controller/DocumentHolder.js
View File

@ -394,8 +394,6 @@ define([
if (key == Common.UI.Keys.ESC) {
Common.UI.Menu.Manager.hideAll();
if (!Common.UI.HintManager.isHintVisible())
Common.NotificationCenter.trigger('leftmenu:change', 'hide');
}
}
},

2
apps/pdfeditor/main/app/controller/LeftMenu.js
View File

@ -768,7 +768,7 @@ define([
return false;
}
}
if (this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() || $(e.target).parents('#left-menu').length ) {
if (this.leftMenu.btnAbout.pressed) {
if (!Common.UI.HintManager.isHintVisible()) {
this.leftMenu.close();
Common.NotificationCenter.trigger('layout:changed', 'leftmenu');

2
apps/presentationeditor/main/app/controller/DocumentHolder.js
View File

@ -737,8 +737,6 @@ define([
}
if (key == Common.UI.Keys.ESC) {
Common.UI.Menu.Manager.hideAll();
if (!Common.UI.HintManager.isHintVisible())
Common.NotificationCenter.trigger('leftmenu:change', 'hide');
}
}
},

2
apps/presentationeditor/main/app/controller/LeftMenu.js
View File

@ -674,7 +674,7 @@ define([
}
}
if ( this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() || $(e.target).parents('#left-menu').length ) {
if ( this.leftMenu.btnAbout.pressed ) {
if (!Common.UI.HintManager.isHintVisible()) {
this.leftMenu.close();
Common.NotificationCenter.trigger('layout:changed', 'leftmenu');

3
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View File

@ -831,8 +831,7 @@ define([
return false;
}
}
if ( this.leftMenu.btnAbout.pressed || this.leftMenu.isPluginButtonPressed() ||
($(e.target).parents('#left-menu').length || this.leftMenu.btnComments.pressed) && this.api.isCellEdited!==true) {
if ( this.leftMenu.btnAbout.pressed) {
if (!Common.UI.HintManager.isHintVisible()) {
this.leftMenu.close();
Common.NotificationCenter.trigger('layout:changed', 'leftmenu');