Changeset 27759

Timestamp:

03/26/2014 11:13:43 PM (12 years ago)

Author:

wonderboymusic

Message:

Fix double avatars and JS errors when spamming/trashing comments.

Props avryl, SergeyBiryukov.
Fixes #27329.

Location:

trunk/src

Files:

• wp-admin/js/edit-comments.js (modified) (5 diffs)
• wp-includes/js/wp-lists.js (modified) (1 diff)

trunk/src/wp-admin/js/edit-comments.js

@@ -3 +3 @@
 
 (function($) {
-var getCount, updateCount, updatePending, dashboardTotals;
+var getCount, updateCount, updatePending;
 
 setCommentsList = function() {
@@ -80 +80 @@
                         a.attr('data-wp-lists', 'delete:the-comment-list:comment-' + id + '::un' + action + '=1');
                         a.attr('class', 'vim-z vim-destructive');
-                        $('.avatar', el).clone().prependTo('#undo-' + id + ' .' + action + '-undo-inside');
+                        $('.avatar', el).first().clone().prependTo('#undo-' + id + ' .' + action + '-undo-inside');
 
                         a.click(function(){
@@ -104 +104 @@
 
                 totalInput.val( total.toString() );
-        };
-
-        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);
         };
 
@@ -154 +136 @@
                         updateCount( a, n );
                 });
-
-                dashboardTotals();
         };
 
         // 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, N, spam, trash, pending,
+                var total_items_i18n, total, spam, trash, pending,
                         untrash = $(settings.target).parent().is('span.untrash'),
                         unspam = $(settings.target).parent().is('span.unspam'),
@@ -206 +186 @@
                 });
 
-                if ( $('#dashboard_right_now').length ) {
-                        N = trash ? -1 * trash : 0;
-                        dashboardTotals(N);
-                } else {
+                if ( ! $('#dashboard_right_now').length ) {
                         total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
                         if ( $(settings.target).parent().is('span.undo') )

trunk/src/wp-includes/js/wp-lists.js

@@ -310 +310 @@
 
         add: function( e, s ) {
-                e = $( $.trim(e) ); // Trim leading whitespaces
+                if ( 'string' == typeof e ) {
+                        e = $( $.trim( e ) ); // Trim leading whitespaces
+                } else {
+                        e = $( e );
+                }
 
                 var list = $(this), old = false, _s = { pos: 0, id: 0, oldId: null }, ba, ref, color;