Skip to content

Commit 4f1e677

Browse files
ENGCOM-1491: [Backport] Fix infinite checkout loader on a script error #15091
- Merge Pull Request #15091 from rogyar/magento2:2.1-checkout-loader-fix - Merged commits: 1. 78a2e51
2 parents ed4b97e + 78a2e51 commit 4f1e677

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

lib/web/mage/requirejs/resolver.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,28 @@ define([
2727
return !!_.findWhere(callbacks, callback);
2828
}
2929

30+
/**
31+
* Checks if provided module is rejected during load.
32+
*
33+
* @param {Object} module - 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
*
3343
* @param {Object} module - Module to be checked.
3444
* @returns {Boolean}
3545
*/
3646
function isPending(module) {
37-
return !!module.depCount;
47+
if (!module.depCount) {
48+
return false;
49+
}
50+
51+
return module.depCount > _.filter(module.depMaps, isRejected).length;
3852
}
3953

4054
/**

0 commit comments

Comments
 (0)