"Trash" status for comments, first run, props caesarsgrunt, see #4529
git-svn-id: http://svn.automattic.com/wordpress/trunk@11731 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
@@ -38,7 +38,7 @@ setCommentsList = function() {
|
||||
settings.data._page = pageInput.val();
|
||||
settings.data._url = document.location.href;
|
||||
|
||||
if ( 'undefined' != showNotice && settings.data.action && settings.data.action == 'delete-comment' && !settings.data.spam )
|
||||
if ( 'undefined' != showNotice && settings.data.action && settings.data.action == 'delete-comment' && settings.data.deleted)
|
||||
return showNotice.warn() ? settings : false;
|
||||
|
||||
return settings;
|
||||
@@ -91,7 +91,7 @@ setCommentsList = function() {
|
||||
if ( isNaN(n) ) return;
|
||||
if ( $(settings.target).parents( 'span.spam' ).size() ) { // we marked a comment as spam
|
||||
n = n + 1;
|
||||
} else if ( $('#' + settings.element).is('.spam') ) { // we approved or deleted a comment marked as spam
|
||||
} else if ( $('#' + settings.element).is('.spam') ) { // we approved, deleted, or destroyed a comment marked as spam
|
||||
n = n - 1;
|
||||
}
|
||||
if ( n < 0 ) { n = 0; }
|
||||
@@ -101,6 +101,25 @@ setCommentsList = function() {
|
||||
a.html(n);
|
||||
});
|
||||
|
||||
$('span.deleted-count').each( function() {
|
||||
var a = $(this), n;
|
||||
n = a.html().replace(/[ ,.]+/g, '');
|
||||
n = parseInt(n,10);
|
||||
if ( isNaN(n) ) return;
|
||||
if ( $(settings.target).parents( 'span.delete' ).size() && $('#' + settings.element).is('.deleted,.spam') ) { // we destroyed a deleted or spam comment
|
||||
n--;
|
||||
} else if ( $(settings.target).parents( 'span.delete' ).size() ) { // we deleted a comment
|
||||
n++;
|
||||
} else if ( $('#' + settings.element).is('.deleted') ) { // we approved or spammed a deleted comment
|
||||
n--;
|
||||
}
|
||||
if ( n < 0 ) { n = 0; }
|
||||
n = n.toString();
|
||||
if ( n.length > 3 )
|
||||
n = n.substr(0, n.length-3)+' '+n.substr(-3);
|
||||
a.html(n);
|
||||
});
|
||||
|
||||
|
||||
// XML response
|
||||
if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) {
|
||||
|
||||
Reference in New Issue
Block a user