Ticket #27533: 27533.5.diff

src/wp-admin/includes/class-wp-comments-list-table.php

@@ -476 +476 @@
 
                                 $format = '<a data-comment-id="%d" data-post-id="%d" class="%s" title="%s" href="#">%s</a>';
 
-                                $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'vim-q edit-comment-inline', esc_attr__( 'Quick Edit' ), __( 'Quick Edit' ) );
+                                $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'vim-q edit-comment-inline comment-inline', esc_attr__( 'Quick Edit' ), __( 'Quick Edit' ) );
 
-                                $actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'vim-r reply-comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
+                                $actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'vim-r reply-comment-inline comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
                         }
 
                         /** This filter is documented in wp-admin/includes/dashboard.php */

src/wp-admin/js/edit-comments.js

@@ -608 +608 @@
                 );
         }
 
-        if ( typeof commentReply != 'undefined' ) {
+        // Quick Edit and Reply have an inline comment editor.
+        $( '#the-comment-list' ).on( 'click', '.comment-inline', function (e) {
+                e.preventDefault();
 
-                // Each "Quick Edit" link, open the comment editor
-                $( 'body' ).on( 'click', '.comment .row-actions .quickedit .edit-comment-inline', function (e) {
-                        e.preventDefault();
+                var $el = $( this ),
+                        action = 'replyto';
 
-                        var $el = $( e.currentTarget );
-                        commentReply.open( $el.data( 'comment-id' ), $el.data( 'post-id' ), 'edit' );
-                } );
+                if ( $el.hasClass( 'edit-comment-inline' ) ) {
+                        action = 'edit';
+                }
 
-                // Each "Reply" link, open the comment reply
-                $( 'body' ).on( 'click', '.comment .row-actions .reply .reply-comment-inline', function (e) {
-                        e.preventDefault();
-
-                        var $el = $( e.currentTarget );
-                        commentReply.open( $el.data('comment-id'), $el.data('post-id') );
-                } );
-        }
+                commentReply.open( $el.data( 'comment-id' ), $el.data( 'post-id' ), action );
+        } );
 });
 
 })(jQuery);