pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[desktop] refactoring for plugins query for desktop app

Browse Source
This commit is contained in:
maxkadushkin
2023-03-14 17:48:31 +03:00
parent c2fe06615b
commit 35e8a843f9
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,38 +114,37 @@ define([
},
loadPlugins: function() {
this.configPlugins.plugins =
this.serverPlugins.plugins = false;
if (this.configPlugins.config) {
this.getPlugins(this.configPlugins.config.pluginsData)
.then(function(loaded)
{
.then(function(loaded) {
me.configPlugins.plugins = loaded;
me.mergePlugins();
})
.catch(function(err)
{
.catch(function(err) {
me.configPlugins.plugins = false;
});
} else
this.configPlugins.plugins = false;
}
var server_plugins_url = '../../../../plugins.json',
me = this;
Common.Utils.loadConfig(server_plugins_url, function (obj) {
if ( obj != 'error' ) {
me.serverPlugins.config = obj;
me.getPlugins(me.serverPlugins.config.pluginsData)
.then(function(loaded)
{
me.serverPlugins.plugins = loaded;
me.mergePlugins();
})
.catch(function(err)
{
me.serverPlugins.plugins = false;
});
} else
me.serverPlugins.plugins = false;
});
if ( !Common.Controllers.Desktop.isActive() || !Common.Controllers.Desktop.isOffline() ) {
var server_plugins_url = '../../../../plugins.json',
me = this;
Common.Utils.loadConfig(server_plugins_url, function (obj) {
if (obj != 'error') {
me.serverPlugins.config = obj;
me.getPlugins(me.serverPlugins.config.pluginsData)
.then(function (loaded) {
me.serverPlugins.plugins = loaded;
me.mergePlugins();
})
.catch(function (err) {
me.serverPlugins.plugins = false;
});
}
});
}
},
onAppShowed: function (config) {