Ticket #6010: 6010.diff

wp-includes/script-loader.php

@@ -122 +122 @@
                                 'good' => __('Good'),
                                 'strong' => __('Strong')
                         ) );
-                        $this->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists'), '20080304' );
+                        $this->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists'), '20080311' );
                         $this->localize( 'admin-comments', 'adminCommentsL10n', array(
                                 'pending' => __('%i% pending') // must look like: "# blah blah"
                         ) );

wp-admin/js/edit-comments.js

@@ -4 +4 @@
 var dimAfter = function( r, settings ) {
         $('li span.comment-count').each( function() {
                 var a = $(this);
-                var n = parseInt(a.html(),10) + ( $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1 );
+                var n = parseInt(a.html(),10);
+                n = n + ( $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1 );
+                if ( n < 0 ) { n = 0; }
                 a.html( n.toString() );
+                $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
         });
         $('.post-com-count span.comment-count').each( function() {
                 var a = $(this);
@@ -18 +21 @@
                         n = n + 1;
                         t = t - 1;
                 }
+                if ( n < 0 ) { n = 0; }
+                if ( t < 0 ) { t = 0; }
                 if ( t >= 0 ) { a.parent().attr('title', adminCommentsL10n.pending.replace( /%i%/, t.toString() ) ); }
                 if ( 0 === t ) { a.parents('strong:first').replaceWith( a.parents('strong:first').html() ); }
                 a.html( n.toString() );
@@ -27 +32 @@
 var delAfter = function( r, settings ) {
         $('li span.comment-count').each( function() {
                 var a = $(this);
-                if ( parseInt(a.html(),10) < 1 ) { return; }
-                // on ?edit-comments.php?comment_status=moderated tab
-                // or the comment is unapproved
-                if ( a.parent('.current').size() || $('#' + settings.element).is('.unapproved') ) {
-                        var n = parseInt(a.html(),10) - 1;
-                        a.html( n.toString() );
-                        ( 0 < n ) ? $('#awaiting-mod').each(function() { $(this).show(); $(this).removeClass('count-0') }) : $('#awaiting-mod').hide();
-                }
+                var n = parseInt(a.html(),10);
+                n = n + ( $('#' + settings.element).is('.unapproved') ? -1 : 1 );
+                if ( n < 0 ) { n = 0; }
+                a.html( n.toString() );
+                $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
         });
         $('.post-com-count span.comment-count').each( function() {
                 var a = $(this);