<!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>[26156] trunk/src/wp-admin/js/edit-comments.js: Avoid jshint errors in edit-comment.js.</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/26156">26156</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-11-14 05:09:46 +0000 (Thu, 14 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid jshint errors in edit-comment.js.
props adamsilverstein.
fixes <a href="http://core.trac.wordpress.org/ticket/25979">#25979</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>Modified: trunk/src/wp-admin/js/edit-comments.js (26155 => 26156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/edit-comments.js 2013-11-14 05:07:19 UTC (rev 26155)
+++ trunk/src/wp-admin/js/edit-comments.js 2013-11-14 05:09:46 UTC (rev 26156)
</span><span class="lines">@@ -1,17 +1,21 @@
</span><del>-var theList, theExtraList, toggleWithKeyboard = false;
</del><ins>+/* global adminCommentsL10n, thousandsSeparator, list_args, QTags, ajaxurl, wpAjax */
+var setCommentsList, theList, theExtraList,
+ toggleWithKeyboard = false;
</ins><span class="cx">
</span><span class="cx"> (function($) {
</span><del>-var getCount, updateCount, updatePending, dashboardTotals;
</del><ins>+var commentReply, getCount, updateCount, updatePending, dashboardTotals;
</ins><span class="cx">
</span><span class="cx"> setCommentsList = function() {
</span><del>- var totalInput, perPageInput, pageInput, lastConfidentTime = 0, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList;
</del><ins>+ var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
+ lastConfidentTime = 0;
</ins><span class="cx">
</span><span class="cx"> totalInput = $('input[name="_total"]', '#comments-form');
</span><span class="cx"> perPageInput = $('input[name="_per_page"]', '#comments-form');
</span><span class="cx"> pageInput = $('input[name="_page"]', '#comments-form');
</span><span class="cx">
</span><span class="cx"> dimAfter = function( r, settings ) {
</span><del>- var c = $('#' + settings.element), editRow, replyID, replyButton;
</del><ins>+ var editRow, replyID, replyButton,
+ c = $( '#' + settings.element );
</ins><span class="cx">
</span><span class="cx"> editRow = $('#replyrow');
</span><span class="cx"> replyID = $('#comment_ID', editRow).val();
</span><span class="lines">@@ -29,13 +33,15 @@
</span><span class="cx"> c.find('div.comment_status').html('1');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- var diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
</del><ins>+ diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
</ins><span class="cx"> updatePending( diff );
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Send current total, page, per_page and url
</span><span class="cx"> delBefore = function( settings, list ) {
</span><del>- var wpListsData = $(settings.target).attr('data-wp-lists'), id, el, n, h, a, author, action = false;
</del><ins>+ var note, id, el, n, h, a, author,
+ action = false,
+ wpListsData = $( settings.target ).attr( 'data-wp-lists' );
</ins><span class="cx">
</span><span class="cx"> settings.data._total = totalInput.val() || 0;
</span><span class="cx"> settings.data._per_page = perPageInput.val() || 0;
</span><span class="lines">@@ -80,7 +86,7 @@
</span><span class="cx"> list.wpList.del(this);
</span><span class="cx"> $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){
</span><span class="cx"> $(this).remove();
</span><del>- $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show() });
</del><ins>+ $('#comment-' + id).css('backgroundColor', '').fadeIn(300, function(){ $(this).show(); });
</ins><span class="cx"> });
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><span class="lines">@@ -101,7 +107,8 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> dashboardTotals = function(n) {
</span><del>- var dash = $('#dashboard_right_now'), total, appr, totalN, apprN;
</del><ins>+ var total, appr, totalN, apprN,
+ dash = $('#dashboard_right_now');
</ins><span class="cx">
</span><span class="cx"> n = n || 0;
</span><span class="cx"> if ( isNaN(n) || !dash.length )
</span><span class="lines">@@ -144,7 +151,7 @@
</span><span class="cx"> var a = $(this), n = getCount(a) + diff;
</span><span class="cx"> if ( n < 1 )
</span><span class="cx"> n = 0;
</span><del>- a.closest('.awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
</del><ins>+ a.closest('.awaiting-mod')[ 0 === n ? 'addClass' : 'removeClass' ]('count-0');
</ins><span class="cx"> updateCount( a, n );
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -153,7 +160,7 @@
</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, N, spam, trash, pending,
</del><ins>+ var total_items_i18n, total, N, 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">@@ -225,7 +232,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! theExtraList || theExtraList.size() == 0 || theExtraList.children().size() == 0 || untrash || unspam ) {
</del><ins>+ if ( ! theExtraList || theExtraList.size() === 0 || theExtraList.children().size() === 0 || untrash || unspam ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -283,7 +290,7 @@
</span><span class="cx"> var wpListsData = $(s.target).attr('data-wp-lists'), id = s.element.replace(/[^0-9]+/g, '');
</span><span class="cx">
</span><span class="cx"> if ( wpListsData.indexOf(':trash=1') != -1 || wpListsData.indexOf(':spam=1') != -1 )
</span><del>- $('#undo-' + id).fadeIn(300, function(){ $(this).show() });
</del><ins>+ $('#undo-' + id).fadeIn(300, function(){ $(this).show(); });
</ins><span class="cx"> });
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -309,7 +316,7 @@
</span><span class="cx"> commentReply.toggle($(this).parent());
</span><span class="cx"> });
</span><span class="cx">
</span><del>- $('#doaction, #doaction2, #post-query-submit').click(function(e){
</del><ins>+ $('#doaction, #doaction2, #post-query-submit').click(function(){
</ins><span class="cx"> if ( $('#the-comment-list #replyrow').length > 0 )
</span><span class="cx"> commentReply.close();
</span><span class="cx"> });
</span><span class="lines">@@ -355,7 +362,7 @@
</span><span class="cx">
</span><span class="cx"> if ( this.cid && this.act == 'edit-comment' ) {
</span><span class="cx"> c = $('#comment-' + this.cid);
</span><del>- c.fadeIn(300, function(){ c.show() }).css('backgroundColor', '');
</del><ins>+ c.fadeIn(300, function(){ c.show(); }).css('backgroundColor', '');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // reset the Quicktags buttons
</span><span class="lines">@@ -403,15 +410,15 @@
</span><span class="cx"> $('#replyhead, #replybtn, #addhead, #addbtn', editRow).hide();
</span><span class="cx">
</span><span class="cx"> c.after( editRow ).fadeOut('fast', function(){
</span><del>- $('#replyrow').fadeIn(300, function(){ $(this).show() });
</del><ins>+ $('#replyrow').fadeIn(300, function(){ $(this).show(); });
</ins><span class="cx"> });
</span><span class="cx"> } else if ( action == 'add' ) {
</span><span class="cx"> $('#addhead, #addbtn', editRow).show();
</span><span class="cx"> $('#replyhead, #replybtn, #edithead, #editbtn', editRow).hide();
</span><span class="cx"> $('#the-comment-list').prepend(editRow);
</span><span class="cx"> $('#replyrow').fadeIn(300);
</span><del>- } else {
- replyButton = $('#replybtn', editRow);
</del><ins>+ } else {
+ replyButton = $('#replybtn', editRow);
</ins><span class="cx"> $('#edithead, #savebtn, #addhead, #addbtn', editRow).hide();
</span><span class="cx"> $('#replyhead, #replybtn', editRow).show();
</span><span class="cx"> c.after(editRow);
</span><span class="lines">@@ -422,7 +429,7 @@
</span><span class="cx"> replyButton.text(adminCommentsL10n.reply);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $('#replyrow').fadeIn(300, function(){ $(this).show() });
</del><ins>+ $('#replyrow').fadeIn(300, function(){ $(this).show(); });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> setTimeout(function() {
</span><span class="lines">@@ -431,7 +438,7 @@
</span><span class="cx"> rtop = $('#replyrow').offset().top;
</span><span class="cx"> rbottom = rtop + $('#replyrow').height();
</span><span class="cx"> scrollTop = window.pageYOffset || document.documentElement.scrollTop;
</span><del>- vp = document.documentElement.clientHeight || self.innerHeight || 0;
</del><ins>+ vp = document.documentElement.clientHeight || window.innerHeight || 0;
</ins><span class="cx"> scrollBottom = scrollTop + vp;
</span><span class="cx">
</span><span class="cx"> if ( scrollBottom - 20 < rbottom )
</span><span class="lines">@@ -513,7 +520,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> c = $.trim(r.data); // Trim leading whitespaces
</span><del>- $(c).hide()
</del><ins>+ $(c).hide();
</ins><span class="cx"> $('#replyrow').after(c);
</span><span class="cx">
</span><span class="cx"> id = $(id);
</span><span class="lines">@@ -572,7 +579,7 @@
</span><span class="cx"> l = $('.tablenav-pages .'+which+'-page:not(.disabled)');
</span><span class="cx"> if (l.length)
</span><span class="cx"> window.location = l[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g, '')+'&hotkeys_highlight_'+first_last+'=1';
</span><del>- }
</del><ins>+ };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> edit_comment = function(event, current_row) {
</span><span class="lines">@@ -590,7 +597,7 @@
</span><span class="cx"> var scope = $('select[name="action"]');
</span><span class="cx"> $('option[value="' + value + '"]', scope).prop('selected', true);
</span><span class="cx"> $('#doaction').click();
</span><del>- }
</del><ins>+ };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> $.table_hotkeys(
</span></span></pre>
</div>
</div>
</body>
</html>