diff --git a/apps/common/main/lib/controller/Plugins.js b/apps/common/main/lib/controller/Plugins.js index e6e0c7413f..b319d5dfe1 100644 --- a/apps/common/main/lib/controller/Plugins.js +++ b/apps/common/main/lib/controller/Plugins.js @@ -456,8 +456,7 @@ define([ !variation.get_InsideMode() && this.viewPlugins.openedPluginMode(plugin.get_Guid()); }, - onPluginClose: function(plugin) { - return; // for test + onPluginClose: function(plugin) { var isIframePlugin = false; if (this.pluginDlg) this.pluginDlg.close(); @@ -568,7 +567,8 @@ define([ pluginVisible = false, isDisplayedInViewer = false; item.variations.forEach(function(itemVar){ - var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, editor) && !itemVar.isSystem; + let isSystem = (true === itemVar.isSystem) || ("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)) isDisplayedInViewer = true; diff --git a/apps/documenteditor/forms/app/controller/Plugins.js b/apps/documenteditor/forms/app/controller/Plugins.js index 00a79e547f..2443204698 100644 --- a/apps/documenteditor/forms/app/controller/Plugins.js +++ b/apps/documenteditor/forms/app/controller/Plugins.js @@ -272,7 +272,8 @@ define([ var variationsArr = [], pluginVisible = false; item.variations.forEach(function(itemVar){ - var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, editor) && !itemVar.isSystem; + let isSystem = (true === itemVar.isSystem) || ("system" === itemVar.type); + var visible = (isEdit || itemVar.isViewer && (itemVar.isDisplayedInViewer!==false)) && _.contains(itemVar.EditorsSupport, editor) && !isSystem; if ( visible ) pluginVisible = true; if (!item.isUICustomizer ) {