milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2159 from thornbill/plugin-manager-improvements

Browse source 
Plugin manager improvements
This commit is contained in:
Joshua M. Boniface 2020-12-04 20:27:37 -05:00 • committed by GitHub
commit dd080a8aef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/pluginManager.js
View file

@ -77,7 +77,7 @@ import { playbackManager } from './playback/playbackmanager';
let pluginInstance = await window[pluginSpec]; let pluginInstance = await window[pluginSpec];
if (typeof pluginInstance === 'function') { if (typeof pluginInstance === 'function') {
pluginInstance = await pluginInstance(); pluginInstance = await new pluginInstance();
} }
// init plugin and pass basic dependencies // init plugin and pass basic dependencies

10
src/scripts/site.js
View file

@ -143,13 +143,9 @@ function loadPlugins() {
list = list.concat(window.NativeShell.getPlugins()); list = list.concat(window.NativeShell.getPlugins());
} }
Promise.all(list.map((plugin) => { Promise.all(list.map(plugin => pluginManager.loadPlugin(plugin)))
return pluginManager.loadPlugin(plugin); .then(() => console.debug('finished loading plugins'))
})) .catch(e => console.warn('failed loading plugins', e))
.then(function () {
console.debug('finished loading plugins');
})
.catch(() => console.debug('failed loading plugins'))
.finally(() => { .finally(() => {
console.groupEnd('loading installed plugins'); console.groupEnd('loading installed plugins');
packageManager.init(); packageManager.init();