WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid jshint errors in edit-comment.js. 

props adamsilverstein.
fixes #25979.

Built from https://develop.svn.wordpress.org/trunk@26156


git-svn-id: http://core.svn.wordpress.org/trunk@26067 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-11-14 05:10:10 +00:00
parent 4fbc450f52
commit 47559f45bf
2 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
wp-admin/js/edit-comments.js
View File

@ -1,17 +1,21 @@
var theList, theExtraList, toggleWithKeyboard = false; /* global adminCommentsL10n, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
var setCommentsList, theList, theExtraList,
toggleWithKeyboard = false;
(function($) { (function($) {
var getCount, updateCount, updatePending, dashboardTotals; var commentReply, getCount, updateCount, updatePending, dashboardTotals;
setCommentsList = function() { setCommentsList = function() {
var totalInput, perPageInput, pageInput, lastConfidentTime = 0, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList; var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
lastConfidentTime = 0;
totalInput = $('input[name="_total"]', '#comments-form'); totalInput = $('input[name="_total"]', '#comments-form');
perPageInput = $('input[name="_per_page"]', '#comments-form'); perPageInput = $('input[name="_per_page"]', '#comments-form');
pageInput = $('input[name="_page"]', '#comments-form'); pageInput = $('input[name="_page"]', '#comments-form');
dimAfter = function( r, settings ) { dimAfter = function( r, settings ) {
var c = $('#' + settings.element), editRow, replyID, replyButton; var editRow, replyID, replyButton,
c = $( '#' + settings.element );
editRow = $('#replyrow'); editRow = $('#replyrow');
replyID = $('#comment_ID', editRow).val(); replyID = $('#comment_ID', editRow).val();
@ -29,13 +33,15 @@ setCommentsList = function() {
c.find('div.comment_status').html('1'); 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 ); updatePending( diff );
}; };
// Send current total, page, per_page and url // Send current total, page, per_page and url
delBefore = function( settings, list ) { delBefore = function( settings, list ) {
var wpListsData = $(settings.target).attr('data-wp-lists'), id, el, n, h, a, author, action = false; 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._total = totalInput.val() || 0;
settings.data._per_page = perPageInput.val() || 0; settings.data._per_page = perPageInput.val() || 0;
@ -80,7 +86,7 @@ setCommentsList = function() {
list.wpList.del(this); list.wpList.del(this);
$('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){ $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){
$(this).remove(); $(this).remove();
$('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show() }); $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show(); });
}); });
return false; return false;
}); });
@ -101,7 +107,8 @@ setCommentsList = function() {
}; };
dashboardTotals = function(n) { dashboardTotals = function(n) {
var dash = $('#dashboard_right_now'), total, appr, totalN, apprN; var total, appr, totalN, apprN,
dash = $('#dashboard_right_now');
n = n || 0; n = n || 0;
if ( isNaN(n) || !dash.length ) if ( isNaN(n) || !dash.length )
@ -144,7 +151,7 @@ setCommentsList = function() {
var a = $(this), n = getCount(a) + diff; var a = $(this), n = getCount(a) + diff;
if ( n < 1 ) if ( n < 1 )
n = 0; 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 ); updateCount( a, n );
}); });
@ -153,7 +160,7 @@ setCommentsList = function() {
// In admin-ajax.php, we send back the unix time stamp instead of 1 on success // In admin-ajax.php, we send back the unix time stamp instead of 1 on success
delAfter = function( r, settings ) { 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'), untrash = $(settings.target).parent().is('span.untrash'),
unspam = $(settings.target).parent().is('span.unspam'), unspam = $(settings.target).parent().is('span.unspam'),
unapproved = $('#' + settings.element).is('.unapproved'); unapproved = $('#' + settings.element).is('.unapproved');
@ -225,7 +232,7 @@ setCommentsList = function() {
} }
} }
if ( ! theExtraList || theExtraList.size() == 0 || theExtraList.children().size() == 0 || untrash || unspam ) { if ( ! theExtraList || theExtraList.size() === 0 || theExtraList.children().size() === 0 || untrash || unspam ) {
return; return;
} }
@ -283,7 +290,7 @@ setCommentsList = function() {
var wpListsData = $(s.target).attr('data-wp-lists'), id = s.element.replace(/[^0-9]+/g, ''); 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 ) 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,7 +316,7 @@ commentReply = {
commentReply.toggle($(this).parent()); 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 ) if ( $('#the-comment-list #replyrow').length > 0 )
commentReply.close(); commentReply.close();
}); });
@ -355,7 +362,7 @@ commentReply = {
if ( this.cid && this.act == 'edit-comment' ) { if ( this.cid && this.act == 'edit-comment' ) {
c = $('#comment-' + this.cid); c = $('#comment-' + this.cid);
c.fadeIn(300, function(){ c.show() }).css('backgroundColor', ''); c.fadeIn(300, function(){ c.show(); }).css('backgroundColor', '');
} }
// reset the Quicktags buttons // reset the Quicktags buttons
@ -403,15 +410,15 @@ commentReply = {
$('#replyhead, #replybtn, #addhead, #addbtn', editRow).hide(); $('#replyhead, #replybtn, #addhead, #addbtn', editRow).hide();
c.after( editRow ).fadeOut('fast', function(){ c.after( editRow ).fadeOut('fast', function(){
$('#replyrow').fadeIn(300, function(){ $(this).show() }); $('#replyrow').fadeIn(300, function(){ $(this).show(); });
}); });
} else if ( action == 'add' ) { } else if ( action == 'add' ) {
$('#addhead, #addbtn', editRow).show(); $('#addhead, #addbtn', editRow).show();
$('#replyhead, #replybtn, #edithead, #editbtn', editRow).hide(); $('#replyhead, #replybtn, #edithead, #editbtn', editRow).hide();
$('#the-comment-list').prepend(editRow); $('#the-comment-list').prepend(editRow);
$('#replyrow').fadeIn(300); $('#replyrow').fadeIn(300);
} else { } else {
replyButton = $('#replybtn', editRow); replyButton = $('#replybtn', editRow);
$('#edithead, #savebtn, #addhead, #addbtn', editRow).hide(); $('#edithead, #savebtn, #addhead, #addbtn', editRow).hide();
$('#replyhead, #replybtn', editRow).show(); $('#replyhead, #replybtn', editRow).show();
c.after(editRow); c.after(editRow);
@ -422,7 +429,7 @@ commentReply = {
replyButton.text(adminCommentsL10n.reply); replyButton.text(adminCommentsL10n.reply);
} }
$('#replyrow').fadeIn(300, function(){ $(this).show() }); $('#replyrow').fadeIn(300, function(){ $(this).show(); });
} }
setTimeout(function() { setTimeout(function() {
@ -431,7 +438,7 @@ commentReply = {
rtop = $('#replyrow').offset().top; rtop = $('#replyrow').offset().top;
rbottom = rtop + $('#replyrow').height(); rbottom = rtop + $('#replyrow').height();
scrollTop = window.pageYOffset || document.documentElement.scrollTop; scrollTop = window.pageYOffset || document.documentElement.scrollTop;
vp = document.documentElement.clientHeight || self.innerHeight || 0; vp = document.documentElement.clientHeight || window.innerHeight || 0;
scrollBottom = scrollTop + vp; scrollBottom = scrollTop + vp;
if ( scrollBottom - 20 < rbottom ) if ( scrollBottom - 20 < rbottom )
@ -513,7 +520,7 @@ commentReply = {
} }
c = $.trim(r.data); // Trim leading whitespaces c = $.trim(r.data); // Trim leading whitespaces
$(c).hide() $(c).hide();
$('#replyrow').after(c); $('#replyrow').after(c);
id = $(id); id = $(id);
@ -572,7 +579,7 @@ $(document).ready(function(){
l = $('.tablenav-pages .'+which+'-page:not(.disabled)'); l = $('.tablenav-pages .'+which+'-page:not(.disabled)');
if (l.length) if (l.length)
window.location = l[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g, '')+'&hotkeys_highlight_'+first_last+'=1'; window.location = l[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g, '')+'&hotkeys_highlight_'+first_last+'=1';
} };
}; };
edit_comment = function(event, current_row) { edit_comment = function(event, current_row) {
@ -590,7 +597,7 @@ $(document).ready(function(){
var scope = $('select[name="action"]'); var scope = $('select[name="action"]');
$('option[value="' + value + '"]', scope).prop('selected', true); $('option[value="' + value + '"]', scope).prop('selected', true);
$('#doaction').click(); $('#doaction').click();
} };
}; };
$.table_hotkeys( $.table_hotkeys(

2
wp-admin/js/edit-comments.min.js vendored
View File

File diff suppressed because one or more lines are too long