Merge remote-tracking branch 'origin/MAGETWO-94226-grid-loader' into BugFixPR

Joan He · Joan He · commit e65b236df6b1 · 2018-08-29T13:43:30.000-05:00
diff --git a/lib/web/mage/requirejs/resolver.js b/lib/web/mage/requirejs/resolver.js
@@ -34,7 +34,7 @@ define([
      * @return {Boolean}
      */
     function isRegistered(module) {
-        return registry[module.id];
+        return registry[module.id] && (registry[module.id].inited || registry[module.id].error);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ define([`
`34`	`34`	`* @return {Boolean}`
`35`	`35`	`*/`
`36`	`36`	`function isRegistered(module) {`
`37`		`- return registry[module.id];`
	`37`	`+ return registry[module.id] && (registry[module.id].inited \|\| registry[module.id].error);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`