Changeset 33655

Timestamp:

08/20/2015 02:50:20 AM (9 years ago)

Author:

wonderboymusic

Message:

Comments List Table:

• Show count next to "Approved"
• Properly increment/decrement counts when row actions are clicked
• In _wp_ajax_delete_comment_response(), return the comment's status with the supplemental data
• Handle counts properly on each scenario of undo

See #11200.

Location:

trunk/src/wp-admin

Files:

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

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

@@ -348 +348 @@
 
     // JS didn't send us everything we need to know. Just die with success message
-    if ( !$total || !$per_page || !$page || !$url )
-        wp_die( time() );
+    if ( ! $total || ! $per_page || ! $page || ! $url ) {
+        $time = time();
+        $comment = get_comment( $comment_id );
+
+        $x = new WP_Ajax_Response( array(
+            'what' => 'comment',
+            // Here for completeness - not used.
+            'id' => $comment_id,
+            'supplemental' => array(
+                'status' => $comment ? $comment->comment_approved : '',
+                'time' => $time
+            )
+        ) );
+        $x->send();
+    }
 
     $total += $delta;
@@ -378 +391 @@
     // The time since the last comment count.
     $time = time();
+    $comment = get_comment( $comment_id );
 
     $x = new WP_Ajax_Response( array(
@@ -384 +398 @@
         'id' => $comment_id,
         'supplemental' => array(
+            'status' => $comment ? $comment->comment_approved : '',
             'total_items_i18n' => sprintf( _n( '%s item', '%s items', $total ), number_format_i18n( $total ) ),
             'total_pages' => ceil( $total / $per_page ),

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

@@ -199 +199 @@
                 '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>')

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

@@ -13 +13 @@
     pageInput = $('input[name="_page"]', '#comments-form');
 
+    // this fires when viewing "All"
     dimAfter = function( r, settings ) {
         var editRow, replyID, replyButton,
@@ -35 +36 @@
         diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
         updatePending( diff );
+        updateCountText( 'span.approved-count', -1 * diff );
     };
 
@@ -138 +140 @@
     };
 
+    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');
-
-        function getUpdate(s) {
-            if ( $(settings.target).parent().is('span.' + s) )
-                return 1;
-            else if ( $('#' + settings.element).is('.' + s) )
-                return -1;
-
-            return 0;
-        }
-
-        if ( untrash )
-            trash = -1;
-        else
-            trash = getUpdate('trash');
-
-        if ( unspam )
-            spam = -1;
-        else
-            spam = getUpdate('spam');
-
-        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 ( pending )
-            updatePending(pending);
-
-        $('span.spam-count').each( function() {
-            var a = $(this), n = getCount(a) + spam;
-            updateCount(a, n);
-        });
-
-        $('span.trash-count').each( function() {
-            var a = $(this), n = getCount(a) + trash;
-            updateCount(a, n);
-        });
+        var total_items_i18n, total,
+            response = true === settings.parsed ? {} : settings.parsed.responses[0],
+            commentStatus = true === settings.parsed ? '' : response.supplemental.status,
+
+            targetParent = $( settings.target ).parent(),
+            commentRow = $('#' + settings.element),
+
+            spamDiff, trashDiff, pendingDiff, approvedDiff,
+
+            approved = commentRow.hasClass( 'approved' ),
+            unapproved = commentRow.hasClass( 'unapproved' ),
+            spammed = commentRow.hasClass( 'spam' ),
+            trashed = commentRow.hasClass( 'trash' );
+
+        // 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.undo' ) ) {
+            // the comment was spammed
+            if ( targetParent.hasClass( 'unspam' ) ) {
+                spamDiff = -1;
+
+                if ( 'trash' === commentStatus ) {
+                    trashDiff = 1;
+                } else if ( '1' === commentStatus ) {
+                    approvedDiff = 1;
+                } else if ( '0' === commentStatus ) {
+                    pendingDiff = 1;
+                }
+
+            // the comment was trashed
+            } else if ( targetParent.hasClass( 'untrash' ) ) {
+                trashDiff = -1;
+
+                if ( 'spam' === commentStatus ) {
+                    spamDiff = 1;
+                } else if ( '1' === commentStatus ) {
+                    approvedDiff = 1;
+                } else if ( '0' === commentStatus ) {
+                    pendingDiff = 1;
+                }
+            }
+
+        // user clicked "Spam"
+        } else if ( targetParent.is( 'span.spam' ) ) {
+            // the comment is currently approved
+            if ( approved ) {
+                approvedDiff = -1;
+            // the comment is currently pending
+            } else if ( unapproved ) {
+                pendingDiff = -1;
+            // the comment was in the trash
+            } else if ( trashed ) {
+                trashDiff = -1;
+            }
+            // you can't spam an item on the spam screen
+            spamDiff = 1;
+
+        // user clicked "Unspam"
+        } else if ( targetParent.is( 'span.unspam' ) ) {
+            if ( approved ) {
+                pendingDiff = 1;
+            } else if ( unapproved ) {
+                approvedDiff = 1;
+            } else if ( trashed ) {
+                // the comment was previously approved
+                if ( targetParent.hasClass( 'approve' ) ) {
+                    approvedDiff = 1;
+                // the comment was previously pending
+                } else if ( targetParent.hasClass( 'unapprove' ) ) {
+                    pendingDiff = 1;
+                }
+            } else if ( spammed ) {
+                if ( targetParent.hasClass( 'approve' ) ) {
+                    approvedDiff = 1;
+
+                } else if ( targetParent.hasClass( 'unapprove' ) ) {
+                    pendingDiff = 1;
+                }
+            }
+            // you can Unspam an item on the spam screen
+            spamDiff = -1;
+
+        // user clicked "Trash"
+        } else if ( targetParent.is( 'span.trash' ) ) {
+            if ( approved ) {
+                approvedDiff = -1;
+            } else if ( unapproved ) {
+                pendingDiff = -1;
+            // the comment was in the spam queue
+            } else if ( spammed ) {
+                spamDiff = -1;
+            }
+            // you can't trash an item on the trash screen
+            trashDiff = 1;
+
+        // user clicked "Restore"
+        } else if ( targetParent.is( 'span.untrash' ) ) {
+            if ( approved ) {
+                pendingDiff = 1;
+            } else if ( unapproved ) {
+                approvedDiff = 1;
+            } else if ( trashed ) {
+                if ( targetParent.hasClass( 'approve' ) ) {
+                    approvedDiff = 1;
+                } else if ( targetParent.hasClass( 'unapprove' ) ) {
+                    pendingDiff = 1;
+                }
+            }
+            // you can't go from trash to spam
+            // you can untrash on the trash screen
+            trashDiff = -1;
+
+        // User clicked "Approve"
+        } else if ( targetParent.is( 'span.approve:not(.unspam):not(.untrash)' ) ) {
+            approvedDiff = 1;
+            pendingDiff = -1;
+
+        // User clicked "Unapprove"
+        } else if ( targetParent.is( 'span.unapprove:not(.unspam):not(.untrash)' ) ) {
+            approvedDiff = -1;
+            pendingDiff = 1;
+
+        // User clicked "Delete Permanently"
+        } else if ( targetParent.is( 'span.delete' ) ) {
+            if ( spammed ) {
+                spamDiff = -1;
+            } else if ( trashed ) {
+                trashDiff = -1;
+            }
+        }
+
+        if ( pendingDiff ) {
+            updatePending( pendingDiff );
+        }
+
+        if ( approvedDiff ) {
+            updateCountText( 'span.approved-count', approvedDiff );
+        }
+
+        if ( spamDiff ) {
+            updateCountText( 'span.spam-count', spamDiff );
+        }
+
+        if ( trashDiff ) {
+            updateCountText( 'span.trash-count', trashDiff );
+        }
 
         if ( ! $('#dashboard_right_now').length ) {
@@ -196 +311 @@
                 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 ( 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());
+            if ( 'object' === typeof r ) {
+                if ( response.supplemental.total_items_i18n && 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( response.supplemental.total_pages_i18n );
+                        $('.tablenav-pages').find('.next-page, .last-page').toggleClass('disabled', response.supplemental.total_pages == $('.current-page').val());
+                    }
+                    updateTotalCount( total, response.supplemental.time, true );
+                } else if ( response.supplemental.time ) {
+                    updateTotalCount( total, response.supplemental.time, false );
                 }
-                updateTotalCount( total, settings.parsed.responses[0].supplemental.time, true );
             } else {
                 updateTotalCount( total, r, false );
@@ -209 +328 @@
         }
 
-        if ( ! theExtraList || theExtraList.size() === 0 || theExtraList.children().size() === 0 || untrash || unspam ) {
+        if ( ! theExtraList || theExtraList.size() === 0 || theExtraList.children().size() === 0 ) {
             return;
         }