From 7dd261ce616317d07be01c85773fd73a47e65ba8 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Fri, 21 Aug 2015 17:25:06 +0000 Subject: [PATCH] Comment List Tables: * Toggle visibility of pending bubble when a comment is dynamically moderated * Add a CSS class to the pending bubble to hide it / remove to show it See #11200. git-svn-id: https://develop.svn.wordpress.org/trunk@33692 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/css/list-tables.css | 5 +++++ src/wp-admin/includes/class-wp-list-table.php | 2 +- src/wp-admin/js/edit-comments.js | 16 ++++++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/css/list-tables.css b/src/wp-admin/css/list-tables.css index fdaa733abe..1852e203ea 100644 --- a/src/wp-admin/css/list-tables.css +++ b/src/wp-admin/css/list-tables.css @@ -117,6 +117,11 @@ text-align: center; } +.column-response .post-com-count-no-pending, +.column-comments .post-com-count-no-pending { + display: none; +} + /* comments */ .commentlist li { diff --git a/src/wp-admin/includes/class-wp-list-table.php b/src/wp-admin/includes/class-wp-list-table.php index d67b24ce6d..5d1edecfbc 100644 --- a/src/wp-admin/includes/class-wp-list-table.php +++ b/src/wp-admin/includes/class-wp-list-table.php @@ -649,7 +649,7 @@ class WP_List_Table { $pending_phrase ); } else { - printf( '%s', + printf( '%s', $pending_comments_number, $approved_comments ? __( 'No pending comments' ) : __( 'No comments' ) ); diff --git a/src/wp-admin/js/edit-comments.js b/src/wp-admin/js/edit-comments.js index 953f934534..8288016976 100644 --- a/src/wp-admin/js/edit-comments.js +++ b/src/wp-admin/js/edit-comments.js @@ -138,12 +138,12 @@ setCommentsList = function() { updatePending = function( diff, commentPostId ) { var postSelector = '.post-com-count-' + commentPostId, noClass = 'comment-count-no-pending', + noParentClass = 'post-com-count-no-pending', pendingClass = 'comment-count-pending', - counts = $( 'span.pending-count' ), pending, noPending; - counts.each(function() { + $( 'span.pending-count' ).each(function() { var a = $(this), n = getCount(a) + diff; if ( n < 1 ) n = 0; @@ -165,7 +165,11 @@ setCommentsList = function() { n = 0; if ( 0 === n ) { + a.parent().addClass( noParentClass ); a.removeClass( pendingClass ).addClass( noClass ); + } else { + a.parent().removeClass( noParentClass ); + a.addClass( pendingClass ).removeClass( noClass ); } updateCount( a, n ); }); @@ -173,7 +177,11 @@ setCommentsList = function() { noPending.each(function() { var a = $(this); if ( diff > 0 ) { + a.parent().removeClass( noParentClass ); a.removeClass( noClass ).addClass( pendingClass ); + } else { + a.parent().addClass( noParentClass ); + a.addClass( noClass ).removeClass( pendingClass ); } updateCount( a, diff ); }); @@ -203,6 +211,8 @@ setCommentsList = function() { if ( 0 === n ) { a.removeClass( approvedClass ).addClass( noClass ); + } else { + a.addClass( approvedClass ).removeClass( noClass ); } updateCount( a, n ); }); @@ -211,6 +221,8 @@ setCommentsList = function() { var a = $(this); if ( diff > 0 ) { a.removeClass( noClass ).addClass( approvedClass ); + } else { + a.addClass( noClass ).removeClass( approvedClass ); } updateCount( a, diff ); });