Ticket #11200: 11200.2.diff

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

@@ -377 +377 @@
 
         // The time since the last comment count.
         $time = time();
+        $comment = get_comment( $comment_id );
 
         $x = new WP_Ajax_Response( array(
                 'what' => 'comment',
                 // Here for completeness - not used.
                 'id' => $comment_id,
+                'data' => $comment->comment_approved,
                 'supplemental' => array(
                         'total_items_i18n' => sprintf( _n( '%s item', '%s items', $total ), number_format_i18n( $total ) ),
                         'total_pages' => ceil( $total / $per_page ),

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

@@ -198 +198 @@
                 $stati = array(
                                 'all' => _nx_noop('All', 'All', 'comments'), // singular not used
                                 'moderated' => _n_noop('Pending <span class="count">(<span class="pending-count">%s</span>)</span>', 'Pending <span class="count">(<span class="pending-count">%s</span>)</span>'),
-                                'approved' => _n_noop('Approved', 'Approved'), // singular not used
+                                'approved' => _n_noop('Approved <span class="count">(<span class="approved-count">%s</span>)</span>', 'Approved <span class="count">(<span class="approved-count">%s</span>)</span>'),
                                 'spam' => _n_noop('Spam <span class="count">(<span class="spam-count">%s</span>)</span>', 'Spam <span class="count">(<span class="spam-count">%s</span>)</span>'),
                                 'trash' => _n_noop('Trash <span class="count">(<span class="trash-count">%s</span>)</span>', 'Trash <span class="count">(<span class="trash-count">%s</span>)</span>')
                         );

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

@@ -12 +12 @@
         perPageInput = $('input[name="_per_page"]', '#comments-form');
         pageInput = $('input[name="_page"]', '#comments-form');
 
+        // this fires when viewing "All"
         dimAfter = function( r, settings ) {
                 var editRow, replyID, replyButton,
                         c = $( '#' + settings.element );
@@ -34 +35 @@
 
                 diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
                 updatePending( diff );
+                updateCountText( 'span.approved-count', -1 * diff );
         };
 
         // Send current total, page, per_page and url
@@ -137 +139 @@
                 });
         };
 
+        updateCountText = function( selector, diff ) {
+                $( selector ).each(function() {
+                        var a = $(this), n = getCount(a) + diff;
+                        if ( n < 1 )
+                                n = 0;
+                        updateCount( a, n );
+                });
+        };
+
         // 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, spam, trash, pending,
-                        untrash = $(settings.target).parent().is('span.untrash'),
-                        unspam = $(settings.target).parent().is('span.unspam'),
-                        unapproved = $('#' + settings.element).is('.unapproved');
+                var total_items_i18n, total,
+                        response = settings.parsed.responses ? settings.parsed.responses[0] : {},
+                        commentStatus = response.data,
 
-                function getUpdate(s) {
-                        if ( $(settings.target).parent().is('span.' + s) )
-                                return 1;
-                        else if ( $('#' + settings.element).is('.' + s) )
-                                return -1;
+                        targetParent = $(settings.target).parent(),
+                        commentRow = $('#' + settings.element),
 
-                        return 0;
-                }
+                        spamDiff, trashDiff, pendingDiff, approvedDiff,
 
-                if ( untrash )
-                        trash = -1;
-                else
-                        trash = getUpdate('trash');
+                        approved = commentRow.is('.approved'),
+                        unapproved = commentRow.is('.unapproved');
 
-                if ( unspam )
-                        spam = -1;
-                else
-                        spam = getUpdate('spam');
+                // the order of these checks is important
+                // .unspam can also have .approve or .unapprove
+                // .untrash can also have .approve or .unapprove
+                if ( targetParent.is( 'span.spam' ) ) {
+                        if ( approved ) {
+                                approvedDiff = -1;
+                        } else if ( unapproved ) {
+                                pendingDiff = -1;
+                        } else if ( 'trash' === commentStatus ) {
+                                trashDiff = -1;
+                        }
+                        spamDiff = 1;
+                } else if ( targetParent.is( 'span.unspam' ) ) {
+                        if ( '0' === commentStatus ) {
+                                pendingDiff = 1;
+                        } else if ( '1' === commentStatus ) {
+                                approvedDiff = 1;
+                        } else if ( 'trash' === commentStatus ) {
+                                trashDiff = 1;
+                        }
+                        spamDiff = -1;
+                } else if ( targetParent.is( 'span.trash' ) ) {
+                        if ( approved ) {
+                                approvedDiff = -1;
+                        } else if ( unapproved ) {
+                                pendingDiff = -1;
+                        } else if ( 'spam' === commentStatus ) {
+                                spamDiff = -1;
+                        }
+                        trashDiff = 1;
+                } else if ( targetParent.is( 'span.untrash' ) ) {
+                        if ( '0' === commentStatus ) {
+                                pendingDiff = 1;
+                        } else if ( '1' === commentStatus ) {
+                                approvedDiff = 1;
+                        } else if ( 'spam' === commentStatus ) {
+                                spamDiff = 1;
+                        }
+                        trashDiff = -1;
+                } else if ( targetParent.is( 'span.approve:not(.unspam):not(.untrash)' ) ) {
+                        approvedDiff = 1;
+                        pendingDiff = -1;
+                } else if ( targetParent.is( 'span.unapprove:not(.unspam):not(.untrash)' ) ) {
+                        approvedDiff = -1;
+                        pendingDiff = 1;
+                }
 
-                if ( $(settings.target).parent().is('span.unapprove') || ( ( untrash || unspam ) && unapproved ) ) {
-                        // a comment was 'deleted' from another list (e.g. approved, spam, trash) and moved to pending,
-                        // or a trash/spam of a pending comment was undone
-                        pending = 1;
-                } else if ( unapproved ) {
-                        // a pending comment was trashed/spammed/approved
-                        pending = -1;
+                if ( pendingDiff ) {
+                        updatePending( pendingDiff );
                 }
 
-                if ( pending )
-                        updatePending(pending);
+                if ( approvedDiff ) {
+                        updateCountText( 'span.approved-count', approvedDiff );
+                }
 
-                $('span.spam-count').each( function() {
-                        var a = $(this), n = getCount(a) + spam;
-                        updateCount(a, n);
-                });
+                if ( spamDiff ) {
+                        updateCountText( 'span.spam-count', spamDiff );
+                }
 
-                $('span.trash-count').each( function() {
-                        var a = $(this), n = getCount(a) + trash;
-                        updateCount(a, n);
-                });
+                if ( trashDiff ) {
+                        updateCountText( 'span.trash-count', trashDiff );
+                }
 
                 if ( ! $('#dashboard_right_now').length ) {
                         total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
@@ -195 +235 @@
                         if ( total < 0 )
                                 total = 0;
 
-                        if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) {
-                                total_items_i18n = settings.parsed.responses[0].supplemental.total_items_i18n || '';
+                        if ( ( 'object' === typeof r ) && lastConfidentTime < response.supplemental.time ) {
+                                total_items_i18n = response.supplemental.total_items_i18n || '';
                                 if ( total_items_i18n ) {
                                         $('.displaying-num').text( total_items_i18n );
-                                        $('.total-pages').text( settings.parsed.responses[0].supplemental.total_pages_i18n );
-                                        $('.tablenav-pages').find('.next-page, .last-page').toggleClass('disabled', settings.parsed.responses[0].supplemental.total_pages == $('.current-page').val());
+                                        $('.total-pages').text( response.supplemental.total_pages_i18n );
+                                        $('.tablenav-pages').find('.next-page, .last-page').toggleClass('disabled', response.supplemental.total_pages == $('.current-page').val());
                                 }
-                                updateTotalCount( total, settings.parsed.responses[0].supplemental.time, true );
+                                updateTotalCount( total, response.supplemental.time, true );
                         } else {
                                 updateTotalCount( total, r, false );
                         }
                 }
 
-                if ( ! theExtraList || theExtraList.size() === 0 || theExtraList.children().size() === 0 || untrash || unspam ) {
+                if ( ! theExtraList || theExtraList.size() === 0 || theExtraList.children().size() === 0 ) {
                         return;
                 }