Skip to content

Commit a3a031d

Browse files
Proper handling for require calls with multiple dependencies:
``` require([ 'ko', 'https://some-site/tracking/api/js' ], function () {}); ```
1 parent c55090b commit a3a031d

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

lib/web/mage/requirejs/resolver.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ define([
2727
return !!_.findWhere(callbacks, callback);
2828
}
2929

30+
/**
31+
* Checks if provided module is rejected during load.
32+
*
33+
* @param {Object} id - Module to be checked.
34+
* @return {Boolean}
35+
*/
36+
function isRejected(module) {
37+
return registry[module.id] && registry[module.id].error;
38+
}
39+
3040
/**
3141
* Checks if provided module has unresolved dependencies.
3242
*
@@ -37,11 +47,7 @@ define([
3747
if (!module.depCount) {
3848
return false;
3949
}
40-
41-
// Return `true` if some dependency doesn't errored yet
42-
return _.some(module.depMaps, function (dependency) {
43-
return !registry[dependency.id].error;
44-
});
50+
return module.depCount > _.filter(module.depMaps, isRejected).length;
4551
}
4652

4753
/**

0 commit comments

Comments
 (0)