Skip to content

Fix infinite checkout loader when some script wasn't loaded correctly because of network error #14874

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
merged 4 commits into from
May 3, 2018
Merged

Fix infinite checkout loader when some script wasn't loaded correctly because of network error #14874

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f93c36
Do not treat module as pending if dependencies could not be loaded
vovayatsyuk Apr 26, 2018
35283e0
Proper handling for `require` calls with multiple dependencies:
vovayatsyuk Apr 26, 2018
d68b5df
JSDoc fix
vovayatsyuk Apr 28, 2018
b3e26cc
JSCS fix: empty line above ‘return’ is required
vovayatsyuk Apr 30, 2018
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