Skip to content

Commit

Permalink
[EngCom] Public Pull Requests - 2.2-develop
Browse files Browse the repository at this point in the history
 - merged latest code from mainline branch
  • Loading branch information
magento-engcom-team authored Jun 5, 2018
2 parents 0e9c2fc + 10f84fd commit ad6355d
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions lib/web/mage/requirejs/resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ define([
], function (_) {
'use strict';

var context = require.s.contexts._,
execCb = context.execCb,
registry = context.registry,
callbacks = [],
retries = 10,
var context = require.s.contexts._,
execCb = context.execCb,
registry = context.registry,
callbacks = [],
retries = 10,
updateDelay = 1,
ready,
update;
Expand All @@ -28,13 +28,13 @@ define([
}

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

/**
Expand All @@ -48,7 +48,7 @@ define([
return false;
}

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

/**
Expand Down

0 comments on commit ad6355d

Please sign in to comment.