diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 2822704d9..3a1989c00 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -614,15 +614,15 @@ define([ $.fn.dropdown.Constructor.prototype.keydown.call(menu_opened[0], e); return false; } - if (this.mode.canPlugins && this.leftMenu.panelPlugins) { + if (this.mode.canPlugins && this.leftMenu.panelPlugins && this.api.isCellEdited!==true) { menu_opened = this.leftMenu.panelPlugins.$el.find('#menu-plugin-container.open > [data-toggle="dropdown"]'); if (menu_opened.length) { $.fn.dropdown.Constructor.prototype.keydown.call(menu_opened[0], e); return false; } } - if (this.leftMenu.btnFile.pressed || this.leftMenu.btnAbout.pressed || this.leftMenu.btnPlugins.pressed || - $(e.target).parents('#left-menu').length && this.api.isCellEdited!==true) { + if (this.leftMenu.btnFile.pressed || this.leftMenu.btnAbout.pressed || + ($(e.target).parents('#left-menu').length || this.leftMenu.btnPlugins.pressed) && this.api.isCellEdited!==true) { this.leftMenu.close(); Common.NotificationCenter.trigger('layout:changed', 'leftmenu'); return false; diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png b/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png index e6edab1d3..25a5ba568 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png and b/apps/spreadsheeteditor/main/resources/img/toolbar-menu.png differ diff --git a/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png b/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png index 06d5f5f4e..f41b03647 100644 Binary files a/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png and b/apps/spreadsheeteditor/main/resources/img/toolbar-menu@2x.png differ diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 3cce8f9db..4c74d623b 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -14,7 +14,7 @@ .toolbar-btn-icon(btn-menu-chat, 59, @toolbar-icon-size); .toolbar-btn-icon(btn-menu-about, 58, @toolbar-icon-size); .toolbar-btn-icon(btn-menu-support, 75, @toolbar-icon-size); - .toolbar-btn-icon(btn-menu-plugin, 75, @toolbar-icon-size); + .toolbar-btn-icon(btn-menu-plugin, 81, @toolbar-icon-size); button.notify .btn-menu-chat, button.notify.over > .btn-menu-chat {background-position: -0*@toolbar-icon-size -60*@toolbar-icon-size;}