Ticket #31590: 31590.1.diff

src/wp-includes/default-filters.php

@@ -230 +230 @@
 add_action( 'init',                'check_theme_switched',            99    );
 add_action( 'after_switch_theme',  '_wp_sidebars_changed'                   );
 add_action( 'wp_print_styles',     'print_emoji_styles'                     );
+add_action( 'wp_print_scripts',    'wp_save_early_comment_reply_clicks', 99 );
 
 if ( isset( $_GET['replytocom'] ) )
     add_action( 'wp_head', 'wp_no_robots' );

src/wp-includes/js/comment-reply.js

@@ -1 @@
-var addComment = {
+window.wp=window.wp||{};
+wp.commentQueue=wp.commentQueue||[];
+window.addComment = {
+        c : function(){},
+
+        checkQueue: function(){
+                if ( 4 === wp.commentQueue.length ) {
+                        a = wp.commentQueue;
+                        addComment.moveForm(a[0],a[1],a[2],a[3]);
+                }
+                wp.commentQueue = [];
+        },
+
         moveForm : function(commId, parentId, respondId, postId) {
                 var t = this, div, comm = t.I(commId), respond = t.I(respondId), cancel = t.I('cancel-comment-reply-link'), parent = t.I('comment_parent'), post = t.I('comment_post_ID');
 
@@ -45 +57 @@
                 return document.getElementById(e);
         }
 };
+addComment.checkQueue();
+ No newline at end of file

src/wp-includes/script-loader.php

@@ -783 +783 @@
 }
 
 /**
+ * Save clicks on a comment reply link before the script has loaded
+ *
+ * On long comment threads, it's possible a visitor will click a reply link
+ * before the comment-reply script loads. React gracefully.
+ *
+ * @since 4.2
+ */
+function wp_save_early_comment_reply_clicks() {
+
+        // check if comment reply script is enqueued
+        // if so, create a 1second method queue for quick clicks
+        if ( wp_script_is( 'comment-reply' ) ) {
+                echo "<script>\n";
+                echo "window.wp=window.wp||{};";
+                echo "wp.commentQueue = [];";
+                echo "window.addComment = { 
+                        moveForm : function(a,b,c,d) { wp.commentQueue = [a,b,c,d]; setTimeout( addComment.c, 500 ); return false; },
+                        c : function() { wp.commentQueue = [];} }\n";
+                echo "</script>\n";
+        }
+
+}
+
+
+/**
  * Administration Screen CSS for changing the styles.
  *
  * If installing the 'wp-admin/' directory will be replaced with './'.