pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 02:29:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE PE SSE] Fix plugins

Browse Source
This commit is contained in:
Julia.Svinareva
2023-10-16 20:36:11 +03:00
parent 843e245463
commit 02ecda3a77
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/common/main/lib/controller/Plugins.js
View File

@ -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,

1
apps/common/main/resources/less/toolbar.less
View File

@ -1019,6 +1019,7 @@ section .field-styles {
.plugin-caption {
flex-basis: 100%;
padding-top: 3px;
.padding-right(6px);
}
.plugin-tools {
display: flex;

2
apps/documenteditor/forms/app/controller/Plugins.js
View File

@ -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;