From 95619669fe081556574cd6c0bdb44dd848721a41 Mon Sep 17 00:00:00 2001 From: "Julia.Svinareva" Date: Tue, 5 Dec 2023 15:46:56 +0300 Subject: [PATCH] [DE PE SSE] Fix updating of plugin icons according to theme in right panel --- apps/common/main/lib/controller/Plugins.js | 13 +++++++++---- apps/documenteditor/main/app/controller/LeftMenu.js | 2 +- .../documenteditor/main/app/controller/RightMenu.js | 7 ++++++- apps/pdfeditor/main/app/controller/LeftMenu.js | 2 +- .../main/app/controller/LeftMenu.js | 2 +- .../main/app/controller/RightMenu.js | 7 ++++++- .../main/app/controller/LeftMenu.js | 2 +- .../main/app/controller/RightMenu.js | 7 ++++++- 8 files changed, 31 insertions(+), 11 deletions(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 95e400b1f9..6d4a40860b 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -472,20 +472,25 @@ define([ updatePluginsButtons: function() { var storePlugins = this.getApplication().getCollection('Common.Collections.Plugins'), me = this, - iconsInSideMenu = []; + iconsInLeftMenu = [], + iconsInRightMenu = []; storePlugins.each(function(item){ me.viewPlugins.updatePluginIcons(item); var guid = item.get('guid'); if (me.viewPlugins.pluginPanels[guid]) { - iconsInSideMenu.push({ + var menu = me.viewPlugins.pluginPanels[guid].menu === 'right' ? iconsInRightMenu : iconsInLeftMenu; + menu.push({ guid: guid, baseUrl: item.get('baseUrl'), parsedIcons: item.get('parsedIcons') }); } }); - if (iconsInSideMenu.length > 0) { - me.viewPlugins.fireEvent('plugins:updateicons', [iconsInSideMenu]); + if (iconsInLeftMenu.length > 0) { + me.viewPlugins.fireEvent('pluginsleft:updateicons', [iconsInLeftMenu]); + } + if (iconsInRightMenu.length > 0) { + me.viewPlugins.fireEvent('pluginsright:updateicons', [iconsInRightMenu]); } }, diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index f9341eee20..fd51712442 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -80,7 +80,7 @@ define([ 'pluginsleft:open': _.bind(this.openPlugin, this), 'pluginsleft:close': _.bind(this.closePlugin, this), 'pluginsleft:hide': _.bind(this.onHidePlugins, this), - 'plugins:updateicons': _.bind(this.updatePluginButtonsIcons, this) + 'pluginsleft:updateicons': _.bind(this.updatePluginButtonsIcons, this) }, 'LeftMenu': { 'comments:show': _.bind(this.commentsShowHide, this, 'show'), diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index ffdbb0b943..3c4f664644 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -73,7 +73,8 @@ define([ 'plugins:addtoright': _.bind(this.addNewPlugin, this), 'pluginsright:open': _.bind(this.openPlugin, this), 'pluginsright:close': _.bind(this.closePlugin, this), - 'pluginsright:hide': _.bind(this.onHidePlugins, this) + 'pluginsright:hide': _.bind(this.onHidePlugins, this), + 'pluginsright:updateicons': _.bind(this.updatePluginButtonsIcons, this) } }); @@ -584,6 +585,10 @@ define([ Common.NotificationCenter.trigger('layout:changed', 'rightmenu'); }, + updatePluginButtonsIcons: function (icons) { + this.rightmenu.updatePluginButtonsIcons(icons); + }, + onBtnCategoryClick: function (btn) { if (btn.options.type === 'plugin' && !btn.isDisabled()) { this.rightmenu.onBtnMenuClick(btn); diff --git a/apps/pdfeditor/main/app/controller/LeftMenu.js b/apps/pdfeditor/main/app/controller/LeftMenu.js index 53545cdea6..54249fc99e 100644 --- a/apps/pdfeditor/main/app/controller/LeftMenu.js +++ b/apps/pdfeditor/main/app/controller/LeftMenu.js @@ -76,7 +76,7 @@ define([ 'pluginsleft:open': _.bind(this.openPlugin, this), 'pluginsleft:close': _.bind(this.closePlugin, this), 'pluginsleft:hide': _.bind(this.onHidePlugins, this), - 'plugins:updateicons': _.bind(this.updatePluginButtonsIcons, this) + 'pluginsleft:updateicons': _.bind(this.updatePluginButtonsIcons, this) }, 'LeftMenu': { 'comments:show': _.bind(this.commentsShowHide, this, 'show'), diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index 9a3e63e0b2..44b3383210 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -74,7 +74,7 @@ define([ 'pluginsleft:open': _.bind(this.openPlugin, this), 'pluginsleft:close': _.bind(this.closePlugin, this), 'pluginsleft:hide': _.bind(this.onHidePlugins, this), - 'plugins:updateicons': _.bind(this.updatePluginButtonsIcons, this) + 'pluginsleft:updateicons': _.bind(this.updatePluginButtonsIcons, this) }, 'Common.Views.About': { 'show': _.bind(this.aboutShowHide, this, false), diff --git a/apps/presentationeditor/main/app/controller/RightMenu.js b/apps/presentationeditor/main/app/controller/RightMenu.js index 68315d0a51..1bdff0e649 100644 --- a/apps/presentationeditor/main/app/controller/RightMenu.js +++ b/apps/presentationeditor/main/app/controller/RightMenu.js @@ -69,7 +69,8 @@ define([ 'plugins:addtoright': _.bind(this.addNewPlugin, this), 'pluginsright:open': _.bind(this.openPlugin, this), 'pluginsright:close': _.bind(this.closePlugin, this), - 'pluginsright:hide': _.bind(this.onHidePlugins, this) + 'pluginsright:hide': _.bind(this.onHidePlugins, this), + 'pluginsright:updateicons': _.bind(this.updatePluginButtonsIcons, this) } }); }, @@ -469,6 +470,10 @@ define([ Common.NotificationCenter.trigger('layout:changed', 'rightmenu'); }, + updatePluginButtonsIcons: function (icons) { + this.rightmenu.updatePluginButtonsIcons(icons); + }, + onBtnCategoryClick: function (btn) { if (btn.options.type === 'plugin' && !btn.isDisabled()) { this.rightmenu.onBtnMenuClick(btn); diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index fcc7d6576c..8416bc432c 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -55,7 +55,7 @@ define([ 'pluginsleft:open': _.bind(this.openPlugin, this), 'pluginsleft:close': _.bind(this.closePlugin, this), 'pluginsleft:hide': _.bind(this.onHidePlugins, this), - 'plugins:updateicons': _.bind(this.updatePluginButtonsIcons, this) + 'pluginsleft:updateicons': _.bind(this.updatePluginButtonsIcons, this) }, 'Common.Views.Header': { 'history:show': function () { diff --git a/apps/spreadsheeteditor/main/app/controller/RightMenu.js b/apps/spreadsheeteditor/main/app/controller/RightMenu.js index 27f5da7459..050bd5e463 100644 --- a/apps/spreadsheeteditor/main/app/controller/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/RightMenu.js @@ -77,7 +77,8 @@ define([ 'plugins:addtoright': _.bind(this.addNewPlugin, this), 'pluginsright:open': _.bind(this.openPlugin, this), 'pluginsright:close': _.bind(this.closePlugin, this), - 'pluginsright:hide': _.bind(this.onHidePlugins, this) + 'pluginsright:hide': _.bind(this.onHidePlugins, this), + 'pluginsright:updateicons': _.bind(this.updatePluginButtonsIcons, this) } }); @@ -549,6 +550,10 @@ define([ Common.NotificationCenter.trigger('layout:changed', 'rightmenu'); }, + updatePluginButtonsIcons: function (icons) { + this.rightmenu.updatePluginButtonsIcons(icons); + }, + onBtnCategoryClick: function (btn) { if (btn.options.type === 'plugin' && !btn.isDisabled()) { this.rightmenu.onBtnMenuClick(btn);