[DE PE SSE] Fix plugin icons in dark theme

ONLYOFFICE · Sep 18, 2023 · f6663c7 · f6663c7
1 parent 8c0388b
commit f6663c7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js
@@ -286,11 +286,13 @@ define([
                 var modes = model.get('variations'),
                     icons = modes[model.get('currentVariation')].get('icons'),
                     parsedIcons = me.viewPlugins.parseIcons(icons),
+                    icon_url = model.get('baseUrl') + parsedIcons['normal'],
                     guid = model.get('guid');
+                model.set('parsedIcons', parsedIcons);
                 var menuItem = new Common.UI.MenuItem({
                     value: guid,
                     caption: model.get('name'),
-                    iconImg: model.get('baseUrl') + parsedIcons['normal'],
+                    iconImg: icon_url,
                     template: _.template([
                         '<div id="<%= id %>" class="menu-item" <% if(!_.isUndefined(options.stopPropagation)) { %> data-stopPropagation="true" <% } %> >',
                             '<img class="menu-item-icon" src="<%= options.iconImg %>">',
@@ -304,6 +306,7 @@ define([
                     stopPropagation: true
                 });
                 menu.addItem(menuItem);
+                model.set('backgroundPlugin', menuItem);
                 var switcher = new Common.UI.Switcher({
                     el: menuItem.$el.find('.plugin-toggle')[0],
                     value: !!model.isSystem,

diff --git a/apps/common/main/lib/view/Plugins.js b/apps/common/main/lib/view/Plugins.js
@@ -298,9 +298,17 @@ define([
             if (!model.get('visible'))
                 return null;
 
-            var btn = model.get('button');
-            if (btn && btn.cmpEl) {
+            var btn = model.get('button'),
+                menuItem = model.get('backgroundPlugin');
+            if (menuItem && menuItem.cmpEl) {
+                menuItem.cmpEl.find("img").attr("src", model.get('baseUrl') + model.get('parsedIcons')['normal']);
+            } else if (btn && btn.cmpEl) {
                 btn.cmpEl.find(".inner-box-icon img").attr("src", model.get('baseUrl') + model.get('parsedIcons')[btn.isActive() ? 'active' : 'normal']);
+                var guid = model.get('guid'),
+                    leftBtn = this.pluginBtns[guid];
+                if (leftBtn && leftBtn.cmpEl) {
+                    leftBtn.cmpEl.find("img").attr("src", model.get('baseUrl') + model.get('parsedIcons')[leftBtn.isActive() ? 'active' : 'normal']);
+                }
             }
         },