Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / big_pipe / js / big_pipe.es6.js

diff --git a/web/core/modules/big_pipe/js/big_pipe.es6.js b/web/core/modules/big_pipe/js/big_pipe.es6.js
index a05fb0eb688065173c749e21de0fcb0d9bfdf77d..df72915a8ed674a6e73a505839d929421ecc2c01 100644 (file)
--- a/web/core/modules/big_pipe/js/big_pipe.es6.js
+++ b/web/core/modules/big_pipe/js/big_pipe.es6.js
@@ -20,16 +20,17 @@
     // Ignore any placeholders that are not in the known placeholder list. Used
     // to avoid someone trying to XSS the site via the placeholdering mechanism.
     if (typeof drupalSettings.bigPipePlaceholderIds[placeholderId] !== 'undefined') {
+      const response = mapTextContentToAjaxResponse(content);
       // If we try to parse the content too early (when the JSON containing Ajax
-      // commands is still arriving), textContent will be empty which will cause
-      // JSON.parse() to fail. Remove once so that it can be processed again
-      // later.
-      // @see bigPipeProcessDocument()
-      if (content === '') {
+      // commands is still arriving), textContent will be empty or incomplete.
+      if (response === false) {
+        /**
+         * Mark as unprocessed so this will be retried later.
+         * @see bigPipeProcessDocument()
+         */
         $(this).removeOnce('big-pipe');
       }
       else {
-        const response = JSON.parse(content);
         // Create a Drupal.Ajax object without associating an element, a
         // progress indicator or a URL.
         const ajaxObject = Drupal.ajax({
@@ -45,6 +46,28 @@
     }
   }
 
+  /**
+   * Maps textContent of <script type="application/vnd.drupal-ajax"> to an AJAX response.
+   *
+   * @param {string} content
+   *   The text content of a <script type="application/vnd.drupal-ajax"> DOM node.
+   * @return {Array|boolean}
+   *   The parsed Ajax response containing an array of Ajax commands, or false in
+   *   case the DOM node hasn't fully arrived yet.
+   */
+  function mapTextContentToAjaxResponse(content) {
+    if (content === '') {
+      return false;
+    }
+
+    try {
+      return JSON.parse(content);
+    }
+    catch (e) {
+      return false;
+    }
+  }
+
   /**
    * Processes a streamed HTML document receiving placeholder replacements.
    *
@@ -89,7 +112,7 @@
   // The frequency with which to check for newly arrived BigPipe placeholders.
   // Hence 50 ms means we check 20 times per second. Setting this to 100 ms or
   // more would cause the user to see content appear noticeably slower.
-  var interval = drupalSettings.bigPipeInterval || 50;
+  const interval = drupalSettings.bigPipeInterval || 50;
   // The internal ID to contain the watcher service.
   let timeoutID;