Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge plugins from config, server and from event asc_onPluginsInit.

Browse source
This commit is contained in:
Julia Radzhabova 2017-10-13 12:47:39 +03:00
parent 9757cb175b
commit d668bd150d
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/main/app/controller/Main.js
View file

@ -1927,9 +1927,10 @@ define([
if (plugins) { if (plugins) {
var arr = [], arrUI = []; var arr = [], arrUI = [];
plugins.pluginsData.forEach(function(item){ plugins.pluginsData.forEach(function(item){
if (uiCustomize!==undefined && _.find(arr, function(arritem) { if (_.find(arr, function(arritem) {
return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid); return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid);
})) return; }) || pluginStore.findWhere({baseUrl: item.baseUrl}) || pluginStore.findWhere({guid: item.guid}))
return;
var variationsArr = [], var variationsArr = [],
pluginVisible = false; pluginVisible = false;
@ -1976,7 +1977,7 @@ define([
this.UICustomizePlugins = arrUI; this.UICustomizePlugins = arrUI;
if ( !uiCustomize ) { if ( !uiCustomize ) {
if (pluginStore) pluginStore.reset(arr); if (pluginStore) pluginStore.add(arr);
this.appOptions.canPlugins = !pluginStore.isEmpty(); this.appOptions.canPlugins = !pluginStore.isEmpty();
} }
} else if (!uiCustomize){ } else if (!uiCustomize){

9
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1696,9 +1696,10 @@ define([
if (plugins) { if (plugins) {
var arr = [], arrUI = []; var arr = [], arrUI = [];
plugins.pluginsData.forEach(function(item){ plugins.pluginsData.forEach(function(item){
if (uiCustomize!==undefined && _.find(arr, function(arritem) { if (_.find(arr, function(arritem) {
return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid); return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid);
})) return; }) || pluginStore.findWhere({baseUrl: item.baseUrl}) || pluginStore.findWhere({guid: item.guid}))
return;
var variationsArr = [], var variationsArr = [],
pluginVisible = false; pluginVisible = false;
@ -1744,7 +1745,7 @@ define([
this.UICustomizePlugins = arrUI; this.UICustomizePlugins = arrUI;
if ( !uiCustomize ) { if ( !uiCustomize ) {
if (pluginStore) pluginStore.reset(arr); if (pluginStore) pluginStore.add(arr);
this.appOptions.canPlugins = !pluginStore.isEmpty(); this.appOptions.canPlugins = !pluginStore.isEmpty();
} }
} else if (!uiCustomize){ } else if (!uiCustomize){

9
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1891,9 +1891,10 @@ define([
if (plugins) { if (plugins) {
var arr = [], arrUI = []; var arr = [], arrUI = [];
plugins.pluginsData.forEach(function(item){ plugins.pluginsData.forEach(function(item){
if (uiCustomize!==undefined && _.find(arr, function(arritem) { if (_.find(arr, function(arritem) {
return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid); return (arritem.get('baseUrl') == item.baseUrl || arritem.get('guid') == item.guid);
})) return; }) || pluginStore.findWhere({baseUrl: item.baseUrl}) || pluginStore.findWhere({guid: item.guid}))
return;
var variationsArr = [], var variationsArr = [],
pluginVisible = false; pluginVisible = false;
@ -1939,7 +1940,7 @@ define([
this.UICustomizePlugins = arrUI; this.UICustomizePlugins = arrUI;
if (!uiCustomize) { if (!uiCustomize) {
if (pluginStore) pluginStore.reset(arr); if (pluginStore) pluginStore.add(arr);
this.appOptions.canPlugins = !pluginStore.isEmpty(); this.appOptions.canPlugins = !pluginStore.isEmpty();
} }
} else if (!uiCustomize){ } else if (!uiCustomize){