From 02ecda3a77e7bbe04e7d0895d11cfd55d4e0d318 Mon Sep 17 00:00:00 2001 From: "Julia.Svinareva" Date: Mon, 16 Oct 2023 20:36:11 +0300 Subject: [PATCH] [DE PE SSE] Fix plugins --- apps/common/main/lib/controller/Plugins.js | 6 +++--- apps/common/main/resources/less/toolbar.less | 1 + apps/documenteditor/forms/app/controller/Plugins.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index 6abccc19bb..2e2686a023 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -744,7 +744,7 @@ define([ isBackgroundPlugin = false, isSystem; item.variations.forEach(function(itemVar, itemInd){ - isSystem = (true === itemVar.isSystem) || ("system" === itemVar.type); + isSystem = (true === itemVar.isSystem) || (Asc.PluginType.System === itemVar.type); var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, editor) && !isSystem; if ( visible ) pluginVisible = true; if (itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) @@ -778,7 +778,7 @@ define([ variationsArr.push(model); if (itemInd === 0) { - isBackgroundPlugin = itemVar.type ? itemVar.type === 'background' : !itemVar.isVisual; + isBackgroundPlugin = itemVar.type ? itemVar.type === Asc.PluginType.Background : !itemVar.isVisual; } } }); @@ -976,7 +976,7 @@ define([ var lang = this.appOptions && this.appOptions.lang ? this.appOptions.lang.split(/[\-_]/)[0] : 'en'; var url = variation.url, // full url - isSystem = (true === variation.isSystem) || ("system" === variation.type); + isSystem = (true === variation.isSystem) || (Asc.PluginType.System === variation.type); var visible = (this.appOptions.isEdit || variation.isViewer && (variation.isDisplayedInViewer!==false)) && _.contains(variation.EditorsSupport, this.editor) && !isSystem; if (visible && !variation.isInsideMode) { var me = this, diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 521b05dfc0..249778a258 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -1019,6 +1019,7 @@ section .field-styles { .plugin-caption { flex-basis: 100%; padding-top: 3px; + .padding-right(6px); } .plugin-tools { display: flex; diff --git a/apps/documenteditor/forms/app/controller/Plugins.js b/apps/documenteditor/forms/app/controller/Plugins.js index b0878c214a..e9f7d62208 100644 --- a/apps/documenteditor/forms/app/controller/Plugins.js +++ b/apps/documenteditor/forms/app/controller/Plugins.js @@ -281,7 +281,7 @@ define([ var variationsArr = [], pluginVisible = false; item.variations.forEach(function(itemVar){ - var isSystem = (true === itemVar.isSystem) || ("system" === itemVar.type); + var isSystem = (true === itemVar.isSystem) || (Asc.PluginType.System === itemVar.type); var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, editor) && !isSystem; if ( visible ) pluginVisible = true;