Changeset 44794

Timestamp:

03/05/2019 01:51:31 AM (7 years ago)

Author:

peterwilsoncc

Message:

Comments: Allow for comment-reply.js to be loaded in the HTML header.

Allows for themes or plugins setting the comment-reply JavaScript as a dependency of an HTML header script. This in turn causes comment-reply.js to be loaded early, requiring execution to be delayed.

Props pento, peterwilsoncc, jorbin for feedback.
Fixes #46280.

File:

• trunk/src/js/_enqueues/lib/comment-reply.js (modified) (3 diffs)

trunk/src/js/_enqueues/lib/comment-reply.js

@@ -33 +33 @@
          * !! sets the variable to true if the property exists.
          */
-        var supportsDataset = !! document.body.dataset;
+        var supportsDataset = !! document.documentElement.dataset;
 
         // For holding the cancel element.
@@ -47 +47 @@
         var observer;
 
-        // Initialise the events.
-        init();
-
-        // Set up a MutationObserver to check for comments loaded late.
-        observeChanges();
+        if ( cutsTheMustard && document.readyState !== 'loading' ) {
+                ready();
+        } else if ( cutsTheMustard ) {
+                window.addEventListener( 'DOMContentLoaded', ready, false );
+        }
+
+        /**
+         * Sets up object variables after the DOM is ready.
+         *
+         * @since 5.1.1
+         */
+        function ready() {
+                // Initialise the events.
+                init();
+
+                // Set up a MutationObserver to check for comments loaded late.
+                observeChanges();
+        }
 
         /**
@@ -163 +176 @@
                         postId    = getDataAttribute( replyLink, 'postid'),
                         follow;
+
+                if ( ! commId || ! parentId || ! respondId || ! postId ) {
+                        /*
+                         * Theme or plugin defines own link via custom `wp_list_comments()` callback
+                         * and calls `moveForm()` either directly or via a custom event hook.
+                         */
+                        return;
+                }
 
                 /*