fix: don't watch for angular.module calls when you're not lazy loading

ocombe · Feb 28, 2015 · 35f7eb5 · 35f7eb5
1 parent 5fb4e99
commit 35f7eb5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/src/ocLazyLoad.js b/src/ocLazyLoad.js
@@ -7,7 +7,8 @@
     runBlocks = {},
     ocLazyLoad = angular.module('oc.lazyLoad', ['ng']),
     broadcast = angular.noop,
-    modulesToLoad = [];
+    modulesToLoad = [],
+    recordDeclarations = [true];
 
   ocLazyLoad.provider('$ocLazyLoad', ['$controllerProvider', '$provide', '$compileProvider', '$filterProvider', '$injector', '$animateProvider',
     function($controllerProvider, $provide, $compileProvider, $filterProvider, $injector, $animateProvider) {
@@ -248,13 +249,15 @@
           templatesLoader.ocLazyLoadLoader = true;
         }
 
-        var filesLoader = function(config, params) {
+        var filesLoader = function filesLoader(config, params) {
           var cssFiles = [],
             templatesFiles = [],
             jsFiles = [],
             promises = [],
             cachePromise = null;
 
+          recordDeclarations.push(true); // start watching angular.module calls
+
           angular.extend(params || {}, config);
 
           var pushFile = function(path) {
@@ -349,7 +352,10 @@
               return filesLoader(config, params);
             });
           } else {
-            return $q.all(promises);
+            return $q.all(promises).finally(function(res) {
+              recordDeclarations.pop(); // stop watching angular.module calls
+              return res;
+            });
           }
         };
 
@@ -431,7 +437,6 @@
               moduleCache = [],
               deferredList = [],
               deferred = $q.defer(),
-              moduleName,
               errText;
 
             if(angular.isUndefined(params)) {
@@ -962,6 +967,7 @@
     });
 
     modulesToLoad = []; // reset for next bootstrap
+    recordDeclarations.pop(); // wait for the next lazy load
   }
 
   var bootstrapFct = angular.bootstrap;
@@ -970,15 +976,15 @@
     return bootstrapFct(element, modules, config);
   };
 
-  var addToInit = function addToInit(name) {
-    if(angular.isString(name) && modulesToLoad.indexOf(name) === -1) {
+  var addToLoadList = function addToLoadList(name) {
+    if(recordDeclarations.length > 0 && angular.isString(name) && modulesToLoad.indexOf(name) === -1) {
       modulesToLoad.push(name);
     }
   };
 
   var ngModuleFct = angular.module;
   angular.module = function(name, requires, configFn) {
-    addToInit(name);
+    addToLoadList(name);
     return ngModuleFct(name, requires, configFn);
   };
 
@@ -990,10 +996,10 @@
       var moduleFns = Array.prototype.slice.call(arguments, 0);
       if (angular.isObject(module) && !angular.isArray(module)) {
         angular.forEach(module, function(value, key) {
-          addToInit(key);
+          addToLoadList(key);
         });
       } else if(angular.isString(module)) {
-        addToInit(module);
+        addToLoadList(module);
       }
       ngMockModuleFct(module);
     }

diff --git a/tests/unit/lazyLoad/testModule.js b/tests/unit/lazyLoad/testModule.js
@@ -24,19 +24,21 @@ testModule.controller('TestCtrl', function($scope) {
   spy.ctrl('ctrl');
 });
 
-//
+// services
 testModule.factory('testService', [function () {
   spy.service('service');
   return {};
 }]);
 
-testModule.filter('testFilter', function () {
+// filters
+angular.module('testModule').filter('testFilter', function () {
   spy.filter('filter');
   return function (input) {
     return input;
   }
 });
 
+// directives
 testModule.directive("test", function () {
   spy.directive('directive');
   return {
@@ -56,6 +58,7 @@ testModule.directive("test", function () {
   };
 });
 
+// constants
 testModule.constant("myConst1", "something");
 testModule.constant("myConst2", undefined);
 testModule.constant("myConst3", null);