<!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>[27759] trunk/src: Fix double avatars and JS errors when spamming/trashing comments.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27759">27759</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-03-26 23:13:43 +0000 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix double avatars and JS errors when spamming/trashing comments.
Props avryl, SergeyBiryukov.
Fixes <a href="http://core.trac.wordpress.org/ticket/27329">#27329</a>.
</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjseditcommentsjs">trunk/src/wp-admin/js/edit-comments.js</a></li>
<li><a href="#trunksrcwpincludesjswplistsjs">trunk/src/wp-includes/js/wp-lists.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminjseditcommentsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/edit-comments.js (27758 => 27759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/edit-comments.js 2014-03-26 23:12:48 UTC (rev 27758)
+++ trunk/src/wp-admin/js/edit-comments.js 2014-03-26 23:13:43 UTC (rev 27759)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> var setCommentsList, theList, theExtraList, commentReply;
</span><span class="cx">
</span><span class="cx"> (function($) {
</span><del>-var getCount, updateCount, updatePending, dashboardTotals;
</del><ins>+var getCount, updateCount, updatePending;
</ins><span class="cx">
</span><span class="cx"> setCommentsList = function() {
</span><span class="cx"> var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> a.attr('href', 'comment.php?action=un' + action + 'comment&c=' + id + '&_wpnonce=' + settings.data._ajax_nonce);
</span><span class="cx"> a.attr('data-wp-lists', 'delete:the-comment-list:comment-' + id + '::un' + action + '=1');
</span><span class="cx"> a.attr('class', 'vim-z vim-destructive');
</span><del>- $('.avatar', el).clone().prependTo('#undo-' + id + ' .' + action + '-undo-inside');
</del><ins>+ $('.avatar', el).first().clone().prependTo('#undo-' + id + ' .' + action + '-undo-inside');
</ins><span class="cx">
</span><span class="cx"> a.click(function(){
</span><span class="cx"> list.wpList.del(this);
</span><span class="lines">@@ -105,24 +105,6 @@
</span><span class="cx"> totalInput.val( total.toString() );
</span><span class="cx"> };
</span><span class="cx">
</span><del>- dashboardTotals = function(n) {
- var total, appr, totalN, apprN,
- dash = $('#dashboard_right_now');
-
- n = n || 0;
- if ( isNaN(n) || !dash.length )
- return;
-
- total = $('span.total-count', dash);
- appr = $('span.approved-count', dash);
- totalN = getCount(total);
-
- totalN = totalN + n;
- apprN = totalN - getCount( $('span.pending-count', dash) ) - getCount( $('span.spam-count', dash) );
- updateCount(total, totalN);
- updateCount(appr, apprN);
- };
-
</del><span class="cx"> getCount = function(el) {
</span><span class="cx"> var n = parseInt( el.html().replace(/[^0-9]+/g, ''), 10 );
</span><span class="cx"> if ( isNaN(n) )
</span><span class="lines">@@ -153,13 +135,11 @@
</span><span class="cx"> a.closest('.awaiting-mod')[ 0 === n ? 'addClass' : 'removeClass' ]('count-0');
</span><span class="cx"> updateCount( a, n );
</span><span class="cx"> });
</span><del>-
- dashboardTotals();
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // In admin-ajax.php, we send back the unix time stamp instead of 1 on success
</span><span class="cx"> delAfter = function( r, settings ) {
</span><del>- var total_items_i18n, total, N, spam, trash, pending,
</del><ins>+ var total_items_i18n, total, spam, trash, pending,
</ins><span class="cx"> untrash = $(settings.target).parent().is('span.untrash'),
</span><span class="cx"> unspam = $(settings.target).parent().is('span.unspam'),
</span><span class="cx"> unapproved = $('#' + settings.element).is('.unapproved');
</span><span class="lines">@@ -205,10 +185,7 @@
</span><span class="cx"> updateCount(a, n);
</span><span class="cx"> });
</span><span class="cx">
</span><del>- if ( $('#dashboard_right_now').length ) {
- N = trash ? -1 * trash : 0;
- dashboardTotals(N);
- } else {
</del><ins>+ if ( ! $('#dashboard_right_now').length ) {
</ins><span class="cx"> total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
</span><span class="cx"> if ( $(settings.target).parent().is('span.undo') )
</span><span class="cx"> total++;
</span></span></pre></div>
<a id="trunksrcwpincludesjswplistsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/wp-lists.js (27758 => 27759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/wp-lists.js 2014-03-26 23:12:48 UTC (rev 27758)
+++ trunk/src/wp-includes/js/wp-lists.js 2014-03-26 23:13:43 UTC (rev 27759)
</span><span class="lines">@@ -309,7 +309,11 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> add: function( e, s ) {
</span><del>- e = $( $.trim(e) ); // Trim leading whitespaces
</del><ins>+ if ( 'string' == typeof e ) {
+ e = $( $.trim( e ) ); // Trim leading whitespaces
+ } else {
+ e = $( e );
+ }
</ins><span class="cx">
</span><span class="cx"> var list = $(this), old = false, _s = { pos: 0, id: 0, oldId: null }, ba, ref, color;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>