MAGETWO-89264: Checkout doesn't work when AdBlock extension enabled and Google Analytics is enabled

Author: Sergey Shvets

app/code/Magento/Checkout/view/frontend/web/js/checkout-loader.js

@@ -23,7 +23,11 @@ define([
      * @param {HTMLElement} $loader - Loader DOM element.
      */
     function init(config, $loader) {
-        resolver(hideLoader.bind(null, $loader));
+        resolver(
+            hideLoader.bind(null, $loader),
+            null,
+            hideLoader.bind(null, $loader)
+        );
     }
 
     return init;

lib/web/mage/requirejs/resolver.js

@@ -28,13 +28,13 @@ define([
     }
 
     /**
-     * Checks if provided module is registered after load.
+     * Checks if provided module is rejected during load.
      *
      * @param {Object} module - Module to be checked.
      * @return {Boolean}
      */
-    function isRegistered(module) {
-        return registry[module.id];
+    function isRejected(module) {
+        return registry[module.id] && registry[module.id].error;
     }
 
     /**
@@ -48,7 +48,21 @@ define([
             return false;
         }
 
-        return module.depCount > _.filter(module.depMaps, isRegistered).length;
+        return module.depCount > _.filter(module.depMaps, isRejected).length;
+    }
+
+    /**
+     * Checks if provided module has errors.
+     *
+     * @param {Object} module - Module to be checked.
+     * @returns {Boolean}
+     */
+    function isError(module) {
+        if (!module.depCount) {
+            return false;
+        }
+
+        return _.filter(module.depMaps, isRejected).length > 0;
     }
 
     /**
@@ -60,6 +74,15 @@ define([
         return _.some(registry, isPending);
     }
 
+    /**
+     * Checks if requirejs's registry object contains errors.
+     *
+     * @returns {Boolean}
+     */
+    function hasError() {
+        return _.some(registry, isError);
+    }
+
     /**
      * Checks if 'resolver' module is in ready
      * state and that there are no pending modules.
@@ -79,6 +102,18 @@ define([
         callback.handler.call(callback.ctx);
     }
 
+    /**
+     * Throws error handler.
+     *
+     * @param {Object} callback
+     */
+    function throwError(callback) {
+
+        if (callback.error) {
+            callback.error.call(callback.ctx);
+        }
+    }
+
     /**
      * Sets 'resolver' module to a ready state
      * and invokes pending callbacks.
@@ -89,6 +124,15 @@ define([
         callbacks.splice(0).forEach(invoke);
     }
 
+    /**
+     *  Reject error
+     */
+    function reject() {
+        ready = true;
+
+        callbacks.splice(0).forEach(throwError);
+    }
+
     /**
      * Drops 'ready' flag and runs the update process.
      */
@@ -105,11 +149,13 @@ define([
      * @param {Function} handler - 'Ready' event handler function.
      * @param {Object} [ctx] - Optional context with which handler
      *      will be invoked.
+     * @param {Function} onError - error event handler
      */
-    function subscribe(handler, ctx) {
+    function subscribe(handler, ctx, onError) {
         var callback = {
             handler: handler,
-            ctx: ctx
+            ctx: ctx,
+            error: onError
         };
 
         if (!isSubscribed(callback)) {
@@ -132,6 +178,8 @@ define([
     update = _.debounce(function (retry) {
         if (!hasPending()) {
             retry ? update(--retry) : resolve();
+        } else if (hasError()) {
+            retry ? update(--retry) : reject();
         }
     }, updateDelay);