Merge pull request #213 from onaluf/master

fix: loading a module with dependencies with multiple oc-lazy-load directives
ocombe · Aug 28, 2015 · f18acbc · f18acbc
2 parents 6771b9f + 098e391
commit f18acbc
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/ocLazyLoad.core.js b/src/ocLazyLoad.core.js
@@ -25,7 +25,8 @@
             },
             debug = false,
             events = false,
-            moduleCache = [];
+            moduleCache = [],
+            modulePromises = {};
 
         moduleCache.push = function(value) {
             if(this.indexOf(value) === -1) {
@@ -588,6 +589,7 @@
                         var res = modulesToLoad.slice(); // clean copy
                         var loadNext = function loadNext(moduleName) {
                             moduleCache.push(moduleName);
+                            modulePromises[moduleName] = deferred.promise;
                             self._loadDependencies(moduleName, localParams).then(function success() {
                                 try {
                                     justLoaded = [];
@@ -610,6 +612,8 @@
 
                         // load the first in list
                         loadNext(modulesToLoad.shift());
+                    } else if (localParams && localParams.name && modulePromises[localParams.name]) {
+                        return modulePromises[localParams.name];
                     } else {
                         deferred.resolve();
                     }