sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Comment List Tables:

Browse Source 
* Ensure that dynamic bubble counts are in sync by `comment_post_ID`
* Scope `:animated` to `#the-comment-list`

See #11200.



git-svn-id: https://develop.svn.wordpress.org/trunk@33662 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-08-20 16:35:21 +00:00
parent 3b4c1e7dd6
commit 28e0ad2de1
4 changed files with 101 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-admin/includes/ajax-actions.php
View File

@ -357,6 +357,7 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
'id' => $comment_id,
'supplemental' => array(
'status' => $comment ? $comment->comment_approved : '',
'postId' => $comment ? $comment->comment_post_ID : '',
'time' => $time
)
) );
@ -398,6 +399,7 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
'id' => $comment_id,
'supplemental' => array(
'status' => $comment ? $comment->comment_approved : '',
'postId' => $comment ? $comment->comment_post_ID : '',
'total_items_i18n' => sprintf( _n( '%s item', '%s items', $total ), number_format_i18n( $total ) ),
'total_pages' => ceil( $total / $per_page ),
'total_pages_i18n' => number_format_i18n( ceil( $total / $per_page ) ),
@ -1042,7 +1044,7 @@ function wp_ajax_replyto_comment( $action ) {
);
if ( $comment_auto_approved )
$response['supplemental'] = array( 'parent_approved' => $parent->comment_ID );
$response['supplemental'] = array( 'parent_approved' => $parent->comment_ID, 'parent_post_id' => $parent->comment_post_ID );
$x = new WP_Ajax_Response();
$x->add( $response );

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

@ -411,7 +411,7 @@ class WP_Comments_List_Table extends WP_List_Table {
<tbody id="the-extra-comment-list" data-wp-lists="list:comment" style="display: none;">
<?php
$this->items = $this->extra_items;
$this->display_rows_or_placeholder();
$this->display_rows_or_placeholder();
?>
</tbody>
@ -698,7 +698,7 @@ class WP_Comments_List_Table extends WP_List_Table {
echo $post_link;
$post_type_object = get_post_type_object( $post->post_type );
echo "<a href='" . get_permalink( $post->ID ) . "' class='comments-view-item-link'>" . $post_type_object->labels->view_item . '</a>';
echo '<span class="post-com-count-wrapper">';
echo '<span class="post-com-count-wrapper post-com-count-', $post->ID, '">';
$this->comments_bubble( $post->ID, $pending_comments );
echo '</span> ';
echo '</div>';

5
src/wp-admin/includes/class-wp-list-table.php
View File

@ -648,6 +648,11 @@ class WP_List_Table {
$pending_comments_number,
$pending_phrase
);
} else {
printf( '<span class="post-com-count post-com-count-pending"><span class="comment-count comment-count-no-pending" aria-hidden="true">%s</span><span class="screen-reader-text">%s</span></span>',
$pending_comments_number,
$approved_comments ? __( 'No pending comments' ) : __( 'No comments' )
);
}
}

104
src/wp-admin/js/edit-comments.js
View File

@ -2,7 +2,7 @@
var setCommentsList, theList, theExtraList, commentReply;
(function($) {
var getCount, updateCount, updateCountText, updatePending;
var getCount, updateCount, updateCountText, updatePending, updateApproved;
setCommentsList = function() {
var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
@ -14,7 +14,7 @@ setCommentsList = function() {
// this fires when viewing "All"
dimAfter = function( r, settings ) {
var editRow, replyID, replyButton,
var editRow, replyID, replyButton, response,
c = $( '#' + settings.element );
editRow = $('#replyrow');
@ -34,9 +34,14 @@ setCommentsList = function() {
}
diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
updatePending( diff );
updateCountText( 'span.approved-count', -1 * diff );
updateCountText( 'span.comment-count-approved', -1 * diff );
if ( true !== settings.parsed && settings.parsed.responses.length ) {
response = settings.parsed.responses[0].supplemental;
updatePending( diff, response.postId );
updateApproved( -1 * diff, response.postId );
} else {
updatePending( diff );
updateApproved( -1 * diff );
}
};
// Send current total, page, per_page and url
@ -130,14 +135,85 @@ setCommentsList = function() {
el.html(n);
};
updatePending = function( diff ) {
$('span.pending-count, .comment-count-pending').each(function() {
updatePending = function( diff, commentPostId ) {
var postSelector = '.post-com-count-' + commentPostId,
noClass = 'comment-count-no-pending',
pendingClass = 'comment-count-pending',
counts = $( 'span.pending-count' ),
pending,
noPending;
counts.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 );
});
if ( ! commentPostId ) {
return;
}
// cache selectors to not get dupes
pending = $( 'span.' + pendingClass, postSelector );
noPending = $( 'span.' + noClass, postSelector );
pending.each(function() {
var a = $(this), n = getCount(a) + diff;
if ( n < 1 )
n = 0;
if ( 0 === n ) {
a.removeClass( pendingClass ).addClass( noClass );
}
updateCount( a, n );
});
noPending.each(function() {
var a = $(this);
if ( diff > 0 ) {
a.removeClass( noClass ).addClass( pendingClass );
}
updateCount( a, diff );
});
};
updateApproved = function( diff, commentPostId ) {
var postSelector = '.post-com-count-' + commentPostId,
noClass = 'comment-count-no-comments',
approvedClass = 'comment-count-approved',
approved,
noComments;
updateCountText( 'span.approved-count', diff );
if ( ! commentPostId ) {
return;
}
// cache selectors to not get dupes
approved = $( 'span.' + approvedClass, postSelector );
noComments = $( 'span.' + noClass, postSelector );
approved.each(function() {
var a = $(this), n = getCount(a) + diff;
if ( n < 1 )
n = 0;
if ( 0 === n ) {
a.removeClass( approvedClass ).addClass( noClass );
}
updateCount( a, n );
});
noComments.each(function() {
var a = $(this);
if ( diff > 0 ) {
a.removeClass( noClass ).addClass( approvedClass );
}
updateCount( a, diff );
});
};
updateCountText = function( selector, diff ) {
@ -152,9 +228,10 @@ setCommentsList = function() {
// 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, animated, animatedCallback,
var total_items_i18n, total, animated, animatedCallback, postSelector,
response = true === settings.parsed ? {} : settings.parsed.responses[0],
commentStatus = true === settings.parsed ? '' : response.supplemental.status,
commentPostId = true === settings.parsed ? '' : response.supplemental.postId,
targetParent = $( settings.target ).parent(),
commentRow = $('#' + settings.element),
@ -285,13 +362,14 @@ setCommentsList = function() {
}
}
postSelector = '.post-com-count-' + commentPostId;
if ( pendingDiff ) {
updatePending( pendingDiff );
updatePending( pendingDiff, commentPostId );
}
if ( approvedDiff ) {
updateCountText( 'span.approved-count', approvedDiff );
updateCountText( 'span.comment-count-approved', approvedDiff );
updateApproved( approvedDiff, commentPostId );
}
if ( spamDiff ) {
@ -337,7 +415,7 @@ setCommentsList = function() {
refillTheExtraList();
animated = $( ':animated' );
animated = $( ':animated', '#the-comment-list' );
animatedCallback = function () {
if ( ! $( '#the-comment-list tr:visible' ).length ) {
theList.get(0).wpList.add( theExtraList.find( '.no-items' ).clone() );
@ -627,7 +705,7 @@ commentReply = {
if ( r.supplemental.parent_approved ) {
pid = $('#comment-' + r.supplemental.parent_approved);
updatePending( -1 );
updatePending( -1, r.supplemental.parent_post_id );
if ( this.comments_listing == 'moderated' ) {
pid.animate( { 'backgroundColor':'#CCEEBB' }, 400, function(){