Changeset 29662

Timestamp:

09/02/2014 03:56:05 AM (11 years ago)

Author:

helen

Message:

Comments: Simplify JS for inline edit and reply.

fixes #27533.

Location:

trunk/src/wp-admin

Files:

• includes/class-wp-comments-list-table.php (modified) (1 diff)
• js/edit-comments.js (modified) (1 diff)

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

@@ -475 +475 @@
                 $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
 
-                $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['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'vim-r reply-comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
+                $format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" title="%s" href="#">%s</a>';
+
+                $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'edit', 'vim-q comment-inline', esc_attr__( 'Quick Edit' ), __( 'Quick Edit' ) );
+
+                $actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
             }
 

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

@@ -609 +609 @@
     }
 
-    if ( typeof commentReply != 'undefined' ) {
-
-        // Each "Quick Edit" link, open the comment editor
-        $( 'body' ).on( 'click', '.comment .row-actions .quickedit .edit-comment-inline', function (e) {
-            e.preventDefault();
-
-            var $el = $( e.currentTarget );
-            commentReply.open( $el.data( 'comment-id' ), $el.data( 'post-id' ), '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') );
-        } );
-    }
+    // Quick Edit and Reply have an inline comment editor.
+    $( '#the-comment-list' ).on( 'click', '.comment-inline', function (e) {
+        e.preventDefault();
+        var $el = $( this ),
+            action = 'replyto';
+
+        if ( 'undefined' !== typeof $el.data( 'action' ) ) {
+            action = $el.data( 'action' );
+        }
+
+        commentReply.open( $el.data( 'commentId' ), $el.data( 'postId' ), action );
+    } );
 });