Updated Drupal to 8.6. This goes with the following updates because it's possible...

[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..3659b991d0bb93eddb254a2499d285cd075ca559 100644 (file)
--- a/web/core/modules/big_pipe/js/big_pipe.es6.js
+++ b/web/core/modules/big_pipe/js/big_pipe.es6.js
@@ -3,7 +3,28 @@
  * Renders BigPipe placeholders using Drupal's Ajax system.
  */
 
-(function ($, Drupal, drupalSettings) {
+(function($, Drupal, drupalSettings) {
+  /**
+   * 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;
+    }
+  }
+
   /**
    * Executes Ajax commands in <script type="application/vnd.drupal-ajax"> tag.
    *
@@ -15,21 +36,25 @@
    *   Script tag created by BigPipe.
    */
   function bigPipeProcessPlaceholderReplacement(index, placeholderReplacement) {
-    const placeholderId = placeholderReplacement.getAttribute('data-big-pipe-replacement-for-placeholder-with-id');
+    const placeholderId = placeholderReplacement.getAttribute(
+      'data-big-pipe-replacement-for-placeholder-with-id',
+    );
     const content = this.textContent.trim();
     // 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') {
+    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);
+      } else {
         // Create a Drupal.Ajax object without associating an element, a
         // progress indicator or a URL.
         const ajaxObject = Drupal.ajax({
@@ -45,6 +70,14 @@
     }
   }
 
+  // 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.
+  const interval = drupalSettings.bigPipeInterval || 50;
+
+  // The internal ID to contain the watcher service.
+  let timeoutID;
+
   /**
    * Processes a streamed HTML document receiving placeholder replacements.
    *
@@ -62,7 +95,8 @@
       return false;
     }
 
-    $(context).find('script[data-big-pipe-replacement-for-placeholder-with-id]')
+    $(context)
+      .find('script[data-big-pipe-replacement-for-placeholder-with-id]')
       .once('big-pipe')
       .each(bigPipeProcessPlaceholderReplacement);
 
@@ -86,13 +120,6 @@
     }, interval);
   }
 
-  // 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;
-  // The internal ID to contain the watcher service.
-  let timeoutID;
-
   bigPipeProcess();
 
   // If something goes wrong, make sure everything is cleaned up and has had a
@@ -103,4 +130,4 @@
     }
     bigPipeProcessDocument(document);
   });
-}(jQuery, Drupal, drupalSettings));
+})(jQuery, Drupal, drupalSettings);