Changeset 33662

Timestamp:

08/20/2015 04:35:21 PM (11 years ago)

Author:

wonderboymusic

Message:

Comment List Tables:

• Ensure that dynamic bubble counts are in sync by comment_post_ID
• Scope :animated to #the-comment-list

See #11200.

Location:

trunk/src/wp-admin

Files:

• includes/ajax-actions.php (modified) (3 diffs)
• includes/class-wp-comments-list-table.php (modified) (2 diffs)
• includes/class-wp-list-table.php (modified) (1 diff)
• js/edit-comments.js (modified) (9 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -358 +358 @@
                         'supplemental' => array(
                                 'status' => $comment ? $comment->comment_approved : '',
+                                'postId' => $comment ? $comment->comment_post_ID : '',
                                 'time' => $time
                         )
@@ -399 +400 @@
                 'supplemental' => array(
                         'status' => $comment ? $comment->comment_approved : '',
+                        'postId' => $comment ? $comment->comment_post_ID : '',
                         'total_items_i18n' => sprintf( _n( '%s item', '%s items', $total ), number_format_i18n( $total ) ),
                         'total_pages' => ceil( $total / $per_page ),
@@ -1043 +1045 @@
 
         if ( $comment_auto_approved )
-                $response['supplemental'] = array( 'parent_approved' => $parent->comment_ID );
+                $response['supplemental'] = array( 'parent_approved' => $parent->comment_ID, 'parent_post_id' => $parent->comment_post_ID );
 
         $x = new WP_Ajax_Response();

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

@@ -412 +412 @@
                 <?php
                         $this->items = $this->extra_items;
-                        $this->display_rows_or_placeholder(); 
+                        $this->display_rows_or_placeholder();
                 ?>
         </tbody>
@@ -699 +699 @@
                 $post_type_object = get_post_type_object( $post->post_type );
                 echo "<a href='" . get_permalink( $post->ID ) . "' class='comments-view-item-link'>" . $post_type_object->labels->view_item . '</a>';
-                echo '<span class="post-com-count-wrapper">';
+                echo '<span class="post-com-count-wrapper post-com-count-', $post->ID, '">';
                 $this->comments_bubble( $post->ID, $pending_comments );
                 echo '</span> ';

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

@@ -648 +648 @@
                                 $pending_comments_number,
                                 $pending_phrase
+                        );
+                } else {
+                        printf( '<span class="post-com-count post-com-count-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
+                                $pending_comments_number,
+                                $approved_comments ? __( 'No pending comments' ) : __( 'No comments' )
                         );
                 }

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

@@ -3 +3 @@
 
 (function($) {
-var getCount, updateCount, updateCountText, updatePending;
+var getCount, updateCount, updateCountText, updatePending, updateApproved;
 
 setCommentsList = function() {
@@ -15 +15 @@
         // this fires when viewing "All"
         dimAfter = function( r, settings ) {
-                var editRow, replyID, replyButton,
+                var editRow, replyID, replyButton, response,
                         c = $( '#' + settings.element );
 
@@ -35 +35 @@
 
                 diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
-                updatePending( diff );
-                updateCountText( 'span.approved-count', -1 * diff  );
-                updateCountText( 'span.comment-count-approved', -1 * diff );
+                if ( true !== settings.parsed && settings.parsed.responses.length ) {
+                        response = settings.parsed.responses[0].supplemental;
+                        updatePending( diff, response.postId );
+                        updateApproved( -1 * diff, response.postId );
+                } else {
+                        updatePending( diff );
+                        updateApproved( -1 * diff  );
+                }
         };
 
@@ -131 +136 @@
         };
 
-        updatePending = function( diff ) {
-                $('span.pending-count, .comment-count-pending').each(function() {
+        updatePending = function( diff, commentPostId ) {
+                var postSelector = '.post-com-count-' + commentPostId,
+                        noClass = 'comment-count-no-pending',
+                        pendingClass = 'comment-count-pending',
+                        counts = $( 'span.pending-count' ),
+                        pending,
+                        noPending;
+
+                counts.each(function() {
                         var a = $(this), n = getCount(a) + diff;
                         if ( n < 1 )
@@ -139 +151 @@
                         updateCount( a, n );
                 });
+
+                if ( ! commentPostId ) {
+                        return;
+                }
+
+                // cache selectors to not get dupes
+                pending = $( 'span.' + pendingClass, postSelector );
+                noPending = $( 'span.' + noClass, postSelector );
+
+                pending.each(function() {
+                        var a = $(this), n = getCount(a) + diff;
+                        if ( n < 1 )
+                                n = 0;
+
+                        if ( 0 === n ) {
+                                a.removeClass( pendingClass ).addClass( noClass );
+                        }
+                        updateCount( a, n );
+                });
+
+                noPending.each(function() {
+                        var a = $(this);
+                        if ( diff > 0 ) {
+                                a.removeClass( noClass ).addClass( pendingClass );
+                        }
+                        updateCount( a, diff );
+                });
+        };
+
+        updateApproved = function( diff, commentPostId ) {
+                var postSelector = '.post-com-count-' + commentPostId,
+                        noClass = 'comment-count-no-comments',
+                        approvedClass = 'comment-count-approved',
+                        approved,
+                        noComments;
+
+                updateCountText( 'span.approved-count', diff );
+
+                if ( ! commentPostId ) {
+                        return;
+                }
+
+                // cache selectors to not get dupes
+                approved = $( 'span.' + approvedClass, postSelector );
+                noComments = $( 'span.' + noClass, postSelector );
+
+                approved.each(function() {
+                        var a = $(this), n = getCount(a) + diff;
+                        if ( n < 1 )
+                                n = 0;
+
+                        if ( 0 === n ) {
+                                a.removeClass( approvedClass ).addClass( noClass );
+                        }
+                        updateCount( a, n );
+                });
+
+                noComments.each(function() {
+                        var a = $(this);
+                        if ( diff > 0 ) {
+                                a.removeClass( noClass ).addClass( approvedClass );
+                        }
+                        updateCount( a, diff );
+                });
         };
 
@@ -153 +229 @@
         // In admin-ajax.php, we send back the unix time stamp instead of 1 on success
         delAfter = function( r, settings ) {
-                var total_items_i18n, total, animated, animatedCallback,
+                var total_items_i18n, total, animated, animatedCallback, postSelector,
                         response = true === settings.parsed ? {} : settings.parsed.responses[0],
                         commentStatus = true === settings.parsed ? '' : response.supplemental.status,
+                        commentPostId = true === settings.parsed ? '' : response.supplemental.postId,
 
                         targetParent = $( settings.target ).parent(),
@@ -286 +363 @@
                 }
 
+                postSelector = '.post-com-count-' + commentPostId;
+
                 if ( pendingDiff ) {
-                        updatePending( pendingDiff );
+                        updatePending( pendingDiff, commentPostId );
                 }
 
                 if ( approvedDiff ) {
-                        updateCountText( 'span.approved-count', approvedDiff  );
-                        updateCountText( 'span.comment-count-approved', approvedDiff );
+                        updateApproved( approvedDiff, commentPostId );
                 }
 
@@ -338 +416 @@
                 refillTheExtraList();
 
-                animated = $( ':animated' );
+                animated = $( ':animated', '#the-comment-list' );
                 animatedCallback = function () {
                         if ( ! $( '#the-comment-list tr:visible' ).length ) {
@@ -628 +706 @@
                 if ( r.supplemental.parent_approved ) {
                         pid = $('#comment-' + r.supplemental.parent_approved);
-                        updatePending( -1 );
+                        updatePending( -1, r.supplemental.parent_post_id );
 
                         if ( this.comments_listing == 'moderated' ) {