Skip to content

[Backport] Fix infinite checkout loader on a script error #15091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magento-engcom-team merged 1 commit into from
May 12, 2018
Merged

[Backport] Fix infinite checkout loader on a script error #15091

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion lib/web/mage/requirejs/resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,28 @@ define([
return !!_.findWhere(callbacks, callback);
}

/**
* Checks if provided module is rejected during load.
*
* @param {Object} module - Module to be checked.
* @return {Boolean}
*/
function isRejected(module) {
return registry[module.id] && registry[module.id].error;
}

/**
* Checks if provided module has unresolved dependencies.
*
* @param {Object} module - Module to be checked.
* @returns {Boolean}
*/
function isPending(module) {
return !!module.depCount;
if (!module.depCount) {
return false;
}

return module.depCount > _.filter(module.depMaps, isRejected).length;
}

/**
Expand Down