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

[DE] async load plugins list from server

Browse source
This commit is contained in:
Maxim Kadushkin 2019-02-04 15:48:51 +03:00
parent 89e42289b3
commit 74aa97c8f6
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/common/main/lib/util/utils.js
View file

@ -738,6 +738,19 @@ Common.Utils.getConfigJson = function (url) {
return null; return null;
} }
Common.Utils.loadConfig = function(url, callback) {
"use strict";
fetch(url)
.then(function(response){
if ( response.ok )
return response.json();
else return 'error';
}).then(function(json){
callback(json);
});
};
Common.Utils.asyncCall = function (callback, scope, args) { Common.Utils.asyncCall = function (callback, scope, args) {
(new Promise(function (resolve, reject) { (new Promise(function (resolve, reject) {
resolve(); resolve();

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

@ -2054,12 +2054,18 @@ define([
if (!pluginsPath) return; if (!pluginsPath) return;
var config_plugins = (this.plugins && this.plugins.pluginsData && this.plugins.pluginsData.length>0) ? this.updatePlugins(this.plugins, false) : null, // return plugins object var config_plugins = (this.plugins && this.plugins.pluginsData && this.plugins.pluginsData.length>0) ? this.updatePlugins(this.plugins, false) : null, // return plugins object
request_plugins = this.updatePlugins( Common.Utils.getConfigJson(pluginsPath), false ); request_plugins /*= this.updatePlugins( Common.Utils.getConfigJson(pluginsPath), false )*/;
this.updatePluginsList({ var me = this;
Common.Utils.loadConfig(pluginsPath, function(json) {
if (json != 'error') {
request_plugins = me.updatePlugins(json);
me.updatePluginsList({
autostart: (config_plugins&&config_plugins.autostart ? config_plugins.autostart : []).concat(request_plugins&&request_plugins.autostart ? request_plugins.autostart : []), autostart: (config_plugins&&config_plugins.autostart ? config_plugins.autostart : []).concat(request_plugins&&request_plugins.autostart ? request_plugins.autostart : []),
pluginsData: (config_plugins ? config_plugins.pluginsData : []).concat(request_plugins ? request_plugins.pluginsData : []) pluginsData: (config_plugins ? config_plugins.pluginsData : []).concat(request_plugins ? request_plugins.pluginsData : [])
}, false); }, false);
}
});
}, },
updatePlugins: function(plugins, uiCustomize) { // plugins from config updatePlugins: function(plugins, uiCustomize) { // plugins from config