Skip to content

Commit 52219f9

Browse files
ocombeocombe
committed
fix: don't try to call angular.module on config names
Fixes #217 Fixes #218
1 parent c64e98e commit 52219f9

6 files changed

Lines changed: 53 additions & 34 deletions

File tree

‎dist/modules/ocLazyLoad.core.js‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
regInvokes = {},
66
regConfigs = [],
77
modulesToLoad = [],
8-
recordDeclarations = [],
8+
// modules to load from angular.module or other sources
9+
realModules = [],
10+
// real modules called from angular.module
11+
recordDeclarations = [],
912
broadcast = angular.noop,
1013
runBlocks = {},
1114
justLoaded = [];
@@ -167,14 +170,13 @@
167170
if (!angular.isString(moduleName)) {
168171
moduleName = getModuleName(moduleName);
169172
}
170-
if (!moduleName || justLoaded.indexOf(moduleName) !== -1) {
173+
if (!moduleName || justLoaded.indexOf(moduleName) !== -1 || realModules.indexOf(moduleName) === -1) {
171174
continue;
172175
}
173-
// new if not registered, and not a config name
174-
var newModule = regModules.indexOf(moduleName) === -1 && !modules[moduleName];
176+
// new if not registered
177+
var newModule = regModules.indexOf(moduleName) === -1;
175178
moduleFn = ngModuleFct(moduleName);
176179
if (newModule) {
177-
// new module
178180
regModules.push(moduleName);
179181
_register(providers, moduleFn.requires, params);
180182
}
@@ -700,20 +702,23 @@
700702
angular.bootstrap = function (element, modules, config) {
701703
// we use slice to make a clean copy
702704
angular.forEach(modules.slice(), function (module) {
703-
_addToLoadList(module, true);
705+
_addToLoadList(module, true, true);
704706
});
705707
return bootstrapFct(element, modules, config);
706708
};
707709

708-
var _addToLoadList = function _addToLoadList(name, force) {
710+
var _addToLoadList = function _addToLoadList(name, force, real) {
709711
if ((recordDeclarations.length > 0 || force) && angular.isString(name) && modulesToLoad.indexOf(name) === -1) {
710712
modulesToLoad.push(name);
713+
if (real) {
714+
realModules.push(name);
715+
}
711716
}
712717
};
713718

714719
var ngModuleFct = angular.module;
715720
angular.module = function (name, requires, configFn) {
716-
_addToLoadList(name);
721+
_addToLoadList(name, false, true);
717722
return ngModuleFct(name, requires, configFn);
718723
};
719724

‎dist/ocLazyLoad.js‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
regInvokes = {},
1313
regConfigs = [],
1414
modulesToLoad = [],
15-
recordDeclarations = [],
15+
// modules to load from angular.module or other sources
16+
realModules = [],
17+
// real modules called from angular.module
18+
recordDeclarations = [],
1619
broadcast = angular.noop,
1720
runBlocks = {},
1821
justLoaded = [];
@@ -174,14 +177,13 @@
174177
if (!angular.isString(moduleName)) {
175178
moduleName = getModuleName(moduleName);
176179
}
177-
if (!moduleName || justLoaded.indexOf(moduleName) !== -1) {
180+
if (!moduleName || justLoaded.indexOf(moduleName) !== -1 || realModules.indexOf(moduleName) === -1) {
178181
continue;
179182
}
180-
// new if not registered, and not a config name
181-
var newModule = regModules.indexOf(moduleName) === -1 && !modules[moduleName];
183+
// new if not registered
184+
var newModule = regModules.indexOf(moduleName) === -1;
182185
moduleFn = ngModuleFct(moduleName);
183186
if (newModule) {
184-
// new module
185187
regModules.push(moduleName);
186188
_register(providers, moduleFn.requires, params);
187189
}
@@ -707,20 +709,23 @@
707709
angular.bootstrap = function (element, modules, config) {
708710
// we use slice to make a clean copy
709711
angular.forEach(modules.slice(), function (module) {
710-
_addToLoadList(module, true);
712+
_addToLoadList(module, true, true);
711713
});
712714
return bootstrapFct(element, modules, config);
713715
};
714716

715-
var _addToLoadList = function _addToLoadList(name, force) {
717+
var _addToLoadList = function _addToLoadList(name, force, real) {
716718
if ((recordDeclarations.length > 0 || force) && angular.isString(name) && modulesToLoad.indexOf(name) === -1) {
717719
modulesToLoad.push(name);
720+
if (real) {
721+
realModules.push(name);
722+
}
718723
}
719724
};
720725

721726
var ngModuleFct = angular.module;
722727
angular.module = function (name, requires, configFn) {
723-
_addToLoadList(name);
728+
_addToLoadList(name, false, true);
724729
return ngModuleFct(name, requires, configFn);
725730
};
726731

‎dist/ocLazyLoad.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/ocLazyLoad.require.js‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
regInvokes = {},
1313
regConfigs = [],
1414
modulesToLoad = [],
15-
recordDeclarations = [],
15+
// modules to load from angular.module or other sources
16+
realModules = [],
17+
// real modules called from angular.module
18+
recordDeclarations = [],
1619
broadcast = angular.noop,
1720
runBlocks = {},
1821
justLoaded = [];
@@ -174,14 +177,13 @@
174177
if (!angular.isString(moduleName)) {
175178
moduleName = getModuleName(moduleName);
176179
}
177-
if (!moduleName || justLoaded.indexOf(moduleName) !== -1) {
180+
if (!moduleName || justLoaded.indexOf(moduleName) !== -1 || realModules.indexOf(moduleName) === -1) {
178181
continue;
179182
}
180-
// new if not registered, and not a config name
181-
var newModule = regModules.indexOf(moduleName) === -1 && !modules[moduleName];
183+
// new if not registered
184+
var newModule = regModules.indexOf(moduleName) === -1;
182185
moduleFn = ngModuleFct(moduleName);
183186
if (newModule) {
184-
// new module
185187
regModules.push(moduleName);
186188
_register(providers, moduleFn.requires, params);
187189
}
@@ -707,20 +709,23 @@
707709
angular.bootstrap = function (element, modules, config) {
708710
// we use slice to make a clean copy
709711
angular.forEach(modules.slice(), function (module) {
710-
_addToLoadList(module, true);
712+
_addToLoadList(module, true, true);
711713
});
712714
return bootstrapFct(element, modules, config);
713715
};
714716

715-
var _addToLoadList = function _addToLoadList(name, force) {
717+
var _addToLoadList = function _addToLoadList(name, force, real) {
716718
if ((recordDeclarations.length > 0 || force) && angular.isString(name) && modulesToLoad.indexOf(name) === -1) {
717719
modulesToLoad.push(name);
720+
if (real) {
721+
realModules.push(name);
722+
}
718723
}
719724
};
720725

721726
var ngModuleFct = angular.module;
722727
angular.module = function (name, requires, configFn) {
723-
_addToLoadList(name);
728+
_addToLoadList(name, false, true);
724729
return ngModuleFct(name, requires, configFn);
725730
};
726731

0 commit comments

Comments
 (0)