fix: components can be registered as object maps now

Fixes #156
ocombe · Apr 9, 2015 · 08ed860 · 08ed860
1 parent 6a5d3d4
commit 08ed860
Show file tree

Hide file tree

Showing 12 changed files with 105 additions and 79 deletions.
diff --git a/dist/modules/ocLazyLoad.core.js b/dist/modules/ocLazyLoad.core.js
@@ -212,9 +212,14 @@
                 regInvokes[moduleName][type] = {};
             }
             var onInvoke = function onInvoke(invokeName, signature) {
-                newInvoke = true;
-                regInvokes[moduleName][type][invokeName].push(signature);
-                broadcast("ocLazyLoad.componentLoaded", [moduleName, type, invokeName]);
+                if (angular.isUndefined(regInvokes[moduleName][type][invokeName])) {
+                    regInvokes[moduleName][type][invokeName] = [];
+                }
+                if (regInvokes[moduleName][type][invokeName].indexOf(signature) === -1) {
+                    newInvoke = true;
+                    regInvokes[moduleName][type][invokeName].push(signature);
+                    broadcast("ocLazyLoad.componentLoaded", [moduleName, type, invokeName]);
+                }
             };
 
             function signature(data) {
@@ -235,22 +240,15 @@
             }
 
             if (angular.isString(invokeList)) {
-                if (angular.isUndefined(regInvokes[moduleName][type][invokeList])) {
-                    regInvokes[moduleName][type][invokeList] = [];
-                }
-                if (regInvokes[moduleName][type][invokeList].indexOf(signature(args[2][1])) === -1) {
-                    onInvoke(invokeList, signature(args[2][1]));
-                }
+                onInvoke(invokeList, signature(args[2][1]));
             } else if (angular.isObject(invokeList)) {
-                // decorators for example
-                angular.forEach(invokeList, function (invoke) {
+                angular.forEach(invokeList, function (invoke, key) {
                     if (angular.isString(invoke)) {
-                        if (angular.isUndefined(regInvokes[moduleName][type][invoke])) {
-                            regInvokes[moduleName][type][invoke] = [];
-                        }
-                        if (regInvokes[moduleName][type][invoke].indexOf(signature(invokeList[1])) === -1) {
-                            onInvoke(invoke, signature(invokeList[1]));
-                        }
+                        // decorators for example
+                        onInvoke(invoke, signature(invokeList[1]));
+                    } else {
+                        // components registered as object lists {"componentName": function() {}}
+                        onInvoke(key, signature(invoke));
                     }
                 });
             } else {

diff --git a/dist/ocLazyLoad.js b/dist/ocLazyLoad.js
diff --git a/dist/ocLazyLoad.js.map b/dist/ocLazyLoad.js.map
diff --git a/dist/ocLazyLoad.min.js b/dist/ocLazyLoad.min.js
diff --git a/dist/ocLazyLoad.min.js.map b/dist/ocLazyLoad.min.js.map
diff --git a/dist/ocLazyLoad.require.js b/dist/ocLazyLoad.require.js
diff --git a/dist/ocLazyLoad.require.js.map b/dist/ocLazyLoad.require.js.map