Ticket #25979: 25979.2.diff

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

@@ -1 @@
-var theList, theExtraList, toggleWithKeyboard = false;
+/* global adminCommentsL10n, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax, commentReply */
+var setCommentsList, theList, theExtraList, toggleWithKeyboard = false;
 
 (function($) {
 var getCount, updateCount, updatePending, dashboardTotals;
 
 setCommentsList = function() {
-        var totalInput, perPageInput, pageInput, lastConfidentTime = 0, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList;
+        var totalInput, perPageInput, pageInput, lastConfidentTime = 0, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff;
 
         totalInput = $('input[name="_total"]', '#comments-form');
         perPageInput = $('input[name="_per_page"]', '#comments-form');
@@ -29 +30 @@
                         c.find('div.comment_status').html('1');
                 }
 
-                var diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
+                diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
                 updatePending( diff );
         };
 
         // Send current total, page, per_page and url
         delBefore = function( settings, list ) {
-                var wpListsData = $(settings.target).attr('data-wp-lists'), id, el, n, h, a, author, action = false;
+                var note, wpListsData = $(settings.target).attr('data-wp-lists'), id, el, n, h, a, author, action = false;
 
                 settings.data._total = totalInput.val() || 0;
                 settings.data._per_page = perPageInput.val() || 0;
@@ -80 +81 @@
                                 list.wpList.del(this);
                                 $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){
                                         $(this).remove();
-                                        $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show() });
+                                        $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show(); });
                                 });
                                 return false;
                         });
@@ -144 +145 @@
                         var a = $(this), n = getCount(a) + diff;
                         if ( n < 1 )
                                 n = 0;
-                        a.closest('.awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
+                        a.closest('.awaiting-mod')[ 0 === n ? 'addClass' : 'removeClass' ]('count-0');
                         updateCount( a, n );
                 });
 
@@ -153 +154 @@
 
         // In admin-ajax.php, we send back the unix time stamp instead of 1 on success
         delAfter = function( r, settings ) {
-                var total, N, spam, trash, pending,
+                var total_items_i18n, total, N, spam, trash, pending,
                         untrash = $(settings.target).parent().is('span.untrash'),
                         unspam = $(settings.target).parent().is('span.unspam'),
                         unapproved = $('#' + settings.element).is('.unapproved');
@@ -225 +226 @@
                         }
                 }
 
-                if ( ! theExtraList || theExtraList.size() == 0 || theExtraList.children().size() == 0 || untrash || unspam ) {
+                if ( ! theExtraList || theExtraList.size() === 0 || theExtraList.children().size() === 0 || untrash || unspam ) {
                         return;
                 }
 
@@ -283 +284 @@
                         var wpListsData = $(s.target).attr('data-wp-lists'), id = s.element.replace(/[^0-9]+/g, '');
 
                         if ( wpListsData.indexOf(':trash=1') != -1 || wpListsData.indexOf(':spam=1') != -1 )
-                                $('#undo-' + id).fadeIn(300, function(){ $(this).show() });
+                                $('#undo-' + id).fadeIn(300, function(){ $(this).show(); });
                 });
 };
 
@@ -309 +310 @@
                         commentReply.toggle($(this).parent());
                 });
 
-                $('#doaction, #doaction2, #post-query-submit').click(function(e){
+                $('#doaction, #doaction2, #post-query-submit').click(function(){
                         if ( $('#the-comment-list #replyrow').length > 0 )
                                 commentReply.close();
                 });
@@ -355 +356 @@
 
                 if ( this.cid && this.act == 'edit-comment' ) {
                         c = $('#comment-' + this.cid);
-                        c.fadeIn(300, function(){ c.show() }).css('backgroundColor', '');
+                        c.fadeIn(300, function(){ c.show(); }).css('backgroundColor', '');
                 }
 
                 // reset the Quicktags buttons
@@ -403 +404 @@
                         $('#replyhead, #replybtn, #addhead, #addbtn', editRow).hide();
 
                         c.after( editRow ).fadeOut('fast', function(){
-                                $('#replyrow').fadeIn(300, function(){ $(this).show() });
+                                $('#replyrow').fadeIn(300, function(){ $(this).show(); });
                         });
                 } else if ( action == 'add' ) {
                         $('#addhead, #addbtn', editRow).show();
                         $('#replyhead, #replybtn, #edithead, #editbtn', editRow).hide();
                         $('#the-comment-list').prepend(editRow);
                         $('#replyrow').fadeIn(300);
-                } else {
-                        replyButton = $('#replybtn', editRow);
+                } else {
+                        replyButton = $('#replybtn', editRow);
                         $('#edithead, #savebtn, #addhead, #addbtn', editRow).hide();
                         $('#replyhead, #replybtn', editRow).show();
                         c.after(editRow);
@@ -422 +423 @@
                                 replyButton.text(adminCommentsL10n.reply);
                         }
 
-                        $('#replyrow').fadeIn(300, function(){ $(this).show() });
+                        $('#replyrow').fadeIn(300, function(){ $(this).show(); });
                 }
 
                 setTimeout(function() {
@@ -431 +432 @@
                         rtop = $('#replyrow').offset().top;
                         rbottom = rtop + $('#replyrow').height();
                         scrollTop = window.pageYOffset || document.documentElement.scrollTop;
-                        vp = document.documentElement.clientHeight || self.innerHeight || 0;
+                        vp = document.documentElement.clientHeight || window.innerHeight || 0;
                         scrollBottom = scrollTop + vp;
 
                         if ( scrollBottom - 20 < rbottom )
@@ -513 +514 @@
                 }
 
                 c = $.trim(r.data); // Trim leading whitespaces
-                $(c).hide()
+                $(c).hide();
                 $('#replyrow').after(c);
 
                 id = $(id);
@@ -572 +573 @@
                                 l = $('.tablenav-pages .'+which+'-page:not(.disabled)');
                                 if (l.length)
                                         window.location = l[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g, '')+'&hotkeys_highlight_'+first_last+'=1';
-                        }
+                        };
                 };
 
                 edit_comment = function(event, current_row) {
@@ -590 +591 @@
                                 var scope = $('select[name="action"]');
                                 $('option[value="' + value + '"]', scope).prop('selected', true);
                                 $('#doaction').click();
-                        }
+                        };
                 };
 
                 $.table_hotkeys(