fix(aurelia): plugin loading module id fix

aurelia · Dec 27, 2014 · ba79cb9 · ba79cb9
1 parent 07de898
commit ba79cb9
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/src/aurelia.js b/src/aurelia.js
@@ -6,21 +6,34 @@ import {EventAggregator, includeEventsIn} from 'aurelia-event-aggregator';
 
 var logger = LogManager.getLogger('aurelia');
 
-function loadPlugins(loader, plugins){
-  var toLoad = [], i, ii, current;
+function loadPlugin(aurelia, loader, info){
+  logger.debug(`Loading plugin ${info.moduleId}.`);
 
-  for(i = 0, ii = plugins.length; i < ii; ++i){
-    current = plugins[i];
-    logger.debug(`Loading plugin ${current.moduleId}.`);
-    toLoad.push(loader.loadModule(current.moduleId).then(exportedValue => {
-      if('install' in exportedValue){
-        return exportedValue.install(current.config || {}).then(() =>{
-          logger.debug(`Installed plugin ${current.moduleId}.`);
+  return loader.loadModule(info.moduleId, '').then(exportedValue => {
+    if('install' in exportedValue){
+      var result = exportedValue.install(aurelia, info.config || {});
+
+      if(result){
+        return result.then(() =>{
+          logger.debug(`Installed plugin ${info.moduleId}.`);
         });
       }else{
-        logger.debug(`Loaded plugin ${current.moduleId}.`);
+        logger.debug(`Installed plugin ${info.moduleId}.`);
       }
-    }));
+    }else{
+      logger.debug(`Loaded plugin ${info.moduleId}.`);
+    }
+  });
+}
+
+function loadPlugins(aurelia){
+  var toLoad = [], 
+      loader = aurelia.loader,
+      plugins = aurelia.plugins,
+      i, ii, current, result;
+
+  for(i = 0, ii = plugins.length; i < ii; ++i){
+    toLoad.push(loadPlugin(aurelia, loader, plugins[i]));
   }
 
   return Promise.all(toLoad);
@@ -82,7 +95,7 @@ export class Aurelia {
       logger.error('You must configure Aurelia with a BindingLanguage implementation.');
     }
 
-    return loadPlugins(this.loader, this.plugins).then(() => {
+    return loadPlugins(this).then(() => {
       return this.container.get(ResourceCoordinator)
         .importResources(this.resourcesToLoad).then(resources => {
           resources.forEach(x => x.register(this.resources));