Changeset 19895

Timestamp:

02/09/2012 11:29:24 PM (13 years ago)

Author:

duck_

Message:

Fix incorrect pending comment count updates for filtered views. Fixes #19905.

Pass the difference (i.e. 1 or -1) to updatePending() so that the current
pending count is changed for each element independently. Also move several
functions back out of the global scope, see r17832 for their introduction.

File:

• trunk/wp-admin/js/edit-comments.dev.js (modified) (6 diffs)

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

@@ -1 @@
-var theList, theExtraList, toggleWithKeyboard = false, getCount, updateCount, updatePending, dashboardTotals;
+var theList, theExtraList, toggleWithKeyboard = false;
+
 (function($) {
+var getCount, updateCount, updatePending, dashboardTotals;
 
 setCommentsList = function() {
@@ -28 +30 @@
         }
 
-        $('span.pending-count').each( function() {
-            var a = $(this), n, dif;
-
-            n = a.html().replace(/[^0-9]+/g, '');
-            n = parseInt(n, 10);
-
-            if ( isNaN(n) )
-                return;
-
-            dif = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
-            n = n + dif;
-
-            if ( n < 0 )
-                n = 0;
-
-            a.closest('.awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
-            updateCount(a, n);
-            dashboardTotals();
-        });
+        var diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
+        updatePending( diff );
     };
 
@@ -130 +115 @@
         updateCount(total, totalN);
         updateCount(appr, apprN);
-
     };
 
@@ -155 +139 @@
     };
 
-    updatePending = function(n) {
-        $('span.pending-count').each( function() {
-            var a = $(this);
-
-            if ( n < 0 )
+    updatePending = function( diff ) {
+        $('span.pending-count').each(function() {
+            var a = $(this), n = getCount(a) + diff;
+            if ( n < 1 )
                 n = 0;
-
             a.closest('.awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
-            updateCount(a, n);
-            dashboardTotals();
-        });
+            updateCount( a, n );
+        });
+
+        dashboardTotals();
     };
 
@@ -194 +177 @@
             spam = getUpdate('spam');
 
-        pending = getCount( $('span.pending-count').eq(0) );
-
-        if ( $(settings.target).parent().is('span.unapprove') || ( ( untrash || unspam ) && unapproved ) ) { // we "deleted" an approved comment from the approved list by clicking "Unapprove"
-            pending = pending + 1;
-        } else if ( unapproved ) { // we deleted a formerly unapproved comment
-            pending = pending - 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;
         }
 
@@ -505 +489 @@
         if ( r.supplemental.parent_approved ) {
             pid = $('#comment-' + r.supplemental.parent_approved);
-            updatePending( getCount( $('span.pending-count').eq(0) ) - 1 );
+            updatePending( -1 );
 
             if ( this.comments_listing == 'moderated' ) {