diff --git a/apps/common/main/lib/view/Chat.js b/apps/common/main/lib/view/Chat.js index 42981b589e..e2896967e5 100644 --- a/apps/common/main/lib/view/Chat.js +++ b/apps/common/main/lib/view/Chat.js @@ -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(); } }, diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index 4265bfbd7b..c0fa8ad4a3 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -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'); } } }, diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 05b6317edf..3e614ba325 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -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'); diff --git a/apps/pdfeditor/main/app/controller/DocumentHolder.js b/apps/pdfeditor/main/app/controller/DocumentHolder.js index 8409bc7c81..11e98bd9e0 100644 --- a/apps/pdfeditor/main/app/controller/DocumentHolder.js +++ b/apps/pdfeditor/main/app/controller/DocumentHolder.js @@ -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'); } } }, diff --git a/apps/pdfeditor/main/app/controller/LeftMenu.js b/apps/pdfeditor/main/app/controller/LeftMenu.js index 9fc1d35fe4..f0a727ae4e 100644 --- a/apps/pdfeditor/main/app/controller/LeftMenu.js +++ b/apps/pdfeditor/main/app/controller/LeftMenu.js @@ -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'); diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index c2619e7eb1..2d0e281a31 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -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'); } } }, diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index c6caddf85a..ca49c11f4d 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -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'); diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 40da6e7c96..d27609b2d9 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -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');