<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[34517] trunk/src/wp-admin/js/edit-comments.js: Comments List Table JS: move the dynamic count functions into closure scope so that `setCommentsList` AND `commentReply` can access them.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34517">34517</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34517","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-24 20:15:54 +0000 (Thu, 24 Sep 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Comments List Table JS: move the dynamic count functions into closure scope so that `setCommentsList` AND `commentReply` can access them. Update counts when replying inline.
Fixes <a href="https://core.trac.wordpress.org/ticket/33403">#33403</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjseditcommentsjs">trunk/src/wp-admin/js/edit-comments.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjseditcommentsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/edit-comments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/edit-comments.js 2015-09-24 20:15:29 UTC (rev 34516)
+++ trunk/src/wp-admin/js/edit-comments.js 2015-09-24 20:15:54 UTC (rev 34517)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,144 +3,98 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> (function($) {
</span><span class="cx" style="display: block; padding: 0 10px"> var getCount, updateCount, updateCountText, updatePending, updateApproved,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- updateHtmlTitle, updateDashboardText, adminTitle = document.title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateHtmlTitle, updateDashboardText, adminTitle = document.title,
+ isDashboard = $('#dashboard_right_now').length,
+ titleDiv, titleRegEx;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-setCommentsList = function() {
- var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
- lastConfidentTime = 0, titleDiv, titleRegEx,
- isDashboard = $('#dashboard_right_now').length;
-
- totalInput = $('input[name="_total"]', '#comments-form');
- perPageInput = $('input[name="_per_page"]', '#comments-form');
- pageInput = $('input[name="_page"]', '#comments-form');
-
- // this fires when viewing "All"
- dimAfter = function( r, settings ) {
- var editRow, replyID, replyButton, response,
- c = $( '#' + settings.element );
-
- if ( true !== settings.parsed ) {
- response = settings.parsed.responses[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ getCount = function(el) {
+ var n = parseInt( el.html().replace(/[^0-9]+/g, ''), 10 );
+ if ( isNaN(n) ) {
+ return 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return n;
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- editRow = $('#replyrow');
- replyID = $('#comment_ID', editRow).val();
- replyButton = $('#replybtn', editRow);
-
- if ( c.is('.unapproved') ) {
- if ( settings.data.id == replyID )
- replyButton.text(adminCommentsL10n.replyApprove);
-
- c.find('div.comment_status').html('0');
- } else {
- if ( settings.data.id == replyID )
- replyButton.text(adminCommentsL10n.reply);
-
- c.find('div.comment_status').html('1');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateCount = function(el, n) {
+ var n1 = '';
+ if ( isNaN(n) ) {
+ return;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
- if ( response ) {
- updateDashboardText( response.supplemental );
- updatePending( diff, response.supplemental.postId );
- updateApproved( -1 * diff, response.supplemental.postId );
- } else {
- updatePending( diff );
- updateApproved( -1 * diff );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ n = n < 1 ? '0' : n.toString();
+ if ( n.length > 3 ) {
+ while ( n.length > 3 ) {
+ n1 = thousandsSeparator + n.substr(n.length - 3) + n1;
+ n = n.substr(0, n.length - 3);
+ }
+ n = n + n1;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ el.html(n);
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Send current total, page, per_page and url
- delBefore = function( settings, list ) {
- var note, id, el, n, h, a, author,
- action = false,
- wpListsData = $( settings.target ).attr( 'data-wp-lists' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateApproved = function( diff, commentPostId ) {
+ var postSelector = '.post-com-count-' + commentPostId,
+ noClass = 'comment-count-no-comments',
+ approvedClass = 'comment-count-approved',
+ approved,
+ noComments;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- settings.data._total = totalInput.val() || 0;
- settings.data._per_page = perPageInput.val() || 0;
- settings.data._page = pageInput.val() || 0;
- settings.data._url = document.location.href;
- settings.data.comment_status = $('input[name="comment_status"]', '#comments-form').val();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateCountText( 'span.approved-count', diff );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wpListsData.indexOf(':trash=1') != -1 )
- action = 'trash';
- else if ( wpListsData.indexOf(':spam=1') != -1 )
- action = 'spam';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! commentPostId ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( action ) {
- id = wpListsData.replace(/.*?comment-([0-9]+).*/, '$1');
- el = $('#comment-' + id);
- note = $('#' + action + '-undo-holder').html();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // cache selectors to not get dupes
+ approved = $( 'span.' + approvedClass, postSelector );
+ noComments = $( 'span.' + noClass, postSelector );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- el.find('.check-column :checkbox').prop('checked', false); // Uncheck the row so as not to be affected by Bulk Edits.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ approved.each(function() {
+ var a = $(this), n = getCount(a) + diff;
+ if ( n < 1 )
+ n = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( el.siblings('#replyrow').length && commentReply.cid == id )
- commentReply.close();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === n ) {
+ a.removeClass( approvedClass ).addClass( noClass );
+ } else {
+ a.addClass( approvedClass ).removeClass( noClass );
+ }
+ updateCount( a, n );
+ });
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( el.is('tr') ) {
- n = el.children(':visible').length;
- author = $('.author strong', el).text();
- h = $('<tr id="undo-' + id + '" class="undo un' + action + '" style="display:none;"><td colspan="' + n + '">' + note + '</td></tr>');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ noComments.each(function() {
+ var a = $(this);
+ if ( diff > 0 ) {
+ a.removeClass( noClass ).addClass( approvedClass );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- author = $('.comment-author', el).text();
- h = $('<div id="undo-' + id + '" style="display:none;" class="undo un' + action + '">' + note + '</div>');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ a.addClass( noClass ).removeClass( approvedClass );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateCount( a, diff );
+ });
+ };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- el.before(h);
-
- $('strong', '#undo-' + id).text(author);
- a = $('.undo a', '#undo-' + id);
- a.attr('href', 'comment.php?action=un' + action + 'comment&c=' + id + '&_wpnonce=' + settings.data._ajax_nonce);
- a.attr('data-wp-lists', 'delete:the-comment-list:comment-' + id + '::un' + action + '=1');
- a.attr('class', 'vim-z vim-destructive');
- $('.avatar', el).first().clone().prependTo('#undo-' + id + ' .' + action + '-undo-inside');
-
- a.click(function(){
- list.wpList.del(this);
- $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){
- $(this).remove();
- $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show(); });
- });
- return false;
- });
- }
-
- return settings;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateCountText = function( selector, diff ) {
+ $( selector ).each(function() {
+ var a = $(this), n = getCount(a) + diff;
+ if ( n < 1 ) {
+ n = 0;
+ }
+ updateCount( a, n );
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Updates the current total (stored in the _total input)
- updateTotalCount = function( total, time, setConfidentTime ) {
- if ( time < lastConfidentTime )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateDashboardText = function ( response ) {
+ if ( ! isDashboard || ! response || ! response.i18n_comments_text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( setConfidentTime )
- lastConfidentTime = time;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var rightNow = $( '#dashboard_right_now' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- totalInput.val( total.toString() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.comment-count a', rightNow ).text( response.i18n_comments_text );
+ $( '.comment-mod-count a', rightNow ).text( response.i18n_moderation_text )
+ .parent()
+ [ response.in_moderation > 0 ? 'removeClass' : 'addClass' ]( 'hidden' );
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- getCount = function(el) {
- var n = parseInt( el.html().replace(/[^0-9]+/g, ''), 10 );
- if ( isNaN(n) )
- return 0;
- return n;
- };
-
- updateCount = function(el, n) {
- var n1 = '';
- if ( isNaN(n) )
- return;
- n = n < 1 ? '0' : n.toString();
- if ( n.length > 3 ) {
- while ( n.length > 3 ) {
- n1 = thousandsSeparator + n.substr(n.length - 3) + n1;
- n = n.substr(0, n.length - 3);
- }
- n = n + n1;
- }
- el.html(n);
- };
-
</del><span class="cx" style="display: block; padding: 0 10px"> updateHtmlTitle = function ( diff ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var newTitle, regExMatch, titleCount, commentFrag;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,68 +184,117 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- updateApproved = function( diff, commentPostId ) {
- var postSelector = '.post-com-count-' + commentPostId,
- noClass = 'comment-count-no-comments',
- approvedClass = 'comment-count-approved',
- approved,
- noComments;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+setCommentsList = function() {
+ var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
+ lastConfidentTime = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- updateCountText( 'span.approved-count', diff );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ totalInput = $('input[name="_total"]', '#comments-form');
+ perPageInput = $('input[name="_per_page"]', '#comments-form');
+ pageInput = $('input[name="_page"]', '#comments-form');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! commentPostId ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Updates the current total (stored in the _total input)
+ updateTotalCount = function( total, time, setConfidentTime ) {
+ if ( time < lastConfidentTime )
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( setConfidentTime )
+ lastConfidentTime = time;
+
+ totalInput.val( total.toString() );
+ };
+
+ // this fires when viewing "All"
+ dimAfter = function( r, settings ) {
+ var editRow, replyID, replyButton, response,
+ c = $( '#' + settings.element );
+
+ if ( true !== settings.parsed ) {
+ response = settings.parsed.responses[0];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // cache selectors to not get dupes
- approved = $( 'span.' + approvedClass, postSelector );
- noComments = $( 'span.' + noClass, postSelector );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ editRow = $('#replyrow');
+ replyID = $('#comment_ID', editRow).val();
+ replyButton = $('#replybtn', editRow);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- approved.each(function() {
- var a = $(this), n = getCount(a) + diff;
- if ( n < 1 )
- n = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( c.is('.unapproved') ) {
+ if ( settings.data.id == replyID )
+ replyButton.text(adminCommentsL10n.replyApprove);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 === n ) {
- a.removeClass( approvedClass ).addClass( noClass );
- } else {
- a.addClass( approvedClass ).removeClass( noClass );
- }
- updateCount( a, n );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ c.find('div.comment_status').html('0');
+ } else {
+ if ( settings.data.id == replyID )
+ replyButton.text(adminCommentsL10n.reply);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- noComments.each(function() {
- var a = $(this);
- if ( diff > 0 ) {
- a.removeClass( noClass ).addClass( approvedClass );
- } else {
- a.addClass( noClass ).removeClass( approvedClass );
- }
- updateCount( a, diff );
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ c.find('div.comment_status').html('1');
+ }
+
+ diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
+ if ( response ) {
+ updateDashboardText( response.supplemental );
+ updatePending( diff, response.supplemental.postId );
+ updateApproved( -1 * diff, response.supplemental.postId );
+ } else {
+ updatePending( diff );
+ updateApproved( -1 * diff );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- updateCountText = function( selector, diff ) {
- $( selector ).each(function() {
- var a = $(this), n = getCount(a) + diff;
- if ( n < 1 ) {
- n = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Send current total, page, per_page and url
+ delBefore = function( settings, list ) {
+ var note, id, el, n, h, a, author,
+ action = false,
+ wpListsData = $( settings.target ).attr( 'data-wp-lists' );
+
+ settings.data._total = totalInput.val() || 0;
+ settings.data._per_page = perPageInput.val() || 0;
+ settings.data._page = pageInput.val() || 0;
+ settings.data._url = document.location.href;
+ settings.data.comment_status = $('input[name="comment_status"]', '#comments-form').val();
+
+ if ( wpListsData.indexOf(':trash=1') != -1 )
+ action = 'trash';
+ else if ( wpListsData.indexOf(':spam=1') != -1 )
+ action = 'spam';
+
+ if ( action ) {
+ id = wpListsData.replace(/.*?comment-([0-9]+).*/, '$1');
+ el = $('#comment-' + id);
+ note = $('#' + action + '-undo-holder').html();
+
+ el.find('.check-column :checkbox').prop('checked', false); // Uncheck the row so as not to be affected by Bulk Edits.
+
+ if ( el.siblings('#replyrow').length && commentReply.cid == id )
+ commentReply.close();
+
+ if ( el.is('tr') ) {
+ n = el.children(':visible').length;
+ author = $('.author strong', el).text();
+ h = $('<tr id="undo-' + id + '" class="undo un' + action + '" style="display:none;"><td colspan="' + n + '">' + note + '</td></tr>');
+ } else {
+ author = $('.comment-author', el).text();
+ h = $('<div id="undo-' + id + '" style="display:none;" class="undo un' + action + '">' + note + '</div>');
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- updateCount( a, n );
- });
- };
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- updateDashboardText = function ( response ) {
- if ( ! isDashboard || ! response || ! response.i18n_comments_text ) {
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ el.before(h);
+
+ $('strong', '#undo-' + id).text(author);
+ a = $('.undo a', '#undo-' + id);
+ a.attr('href', 'comment.php?action=un' + action + 'comment&c=' + id + '&_wpnonce=' + settings.data._ajax_nonce);
+ a.attr('data-wp-lists', 'delete:the-comment-list:comment-' + id + '::un' + action + '=1');
+ a.attr('class', 'vim-z vim-destructive');
+ $('.avatar', el).first().clone().prependTo('#undo-' + id + ' .' + action + '-undo-inside');
+
+ a.click(function(){
+ list.wpList.del(this);
+ $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){
+ $(this).remove();
+ $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show(); });
+ });
+ return false;
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var rightNow = $( '#dashboard_right_now' );
-
- $( '.comment-count a', rightNow ).text( response.i18n_comments_text );
- $( '.comment-mod-count a', rightNow ).text( response.i18n_moderation_text )
- .parent()
- [ response.in_moderation > 0 ? 'removeClass' : 'addClass' ]( 'hidden' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return settings;
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // In admin-ajax.php, we send back the unix time stamp instead of 1 on success
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -794,7 +797,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( r.supplemental.i18n_comments_text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- updateDashboardText( r.supplemental );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isDashboard ) {
+ updateDashboardText( r.supplemental );
+ } else {
+ updateApproved( 1, r.supplemental.parent_post_id );
+ updateCountText( 'span.all-count', 1 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> c = $.trim(r.data); // Trim leading whitespaces
</span></span></pre>
</div>
</div>
</body>
</html>