<!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>[37743] trunk/src: Comments: Wrap or unwrap the List Table comment_date as comment status changes via Ajax.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/37743">37743</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/37743","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>rachelbaker</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-06-17 21:47:58 +0000 (Fri, 17 Jun 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Comments: Wrap or unwrap the List Table comment_date as comment status changes via Ajax.
Introduced in <a href="https://core.trac.wordpress.org/changeset/36521">[36521]</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/36742">#36742</a>.
Props imath, adamsilverstein.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</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="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2016-06-17 20:46:08 UTC (rev 37742)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2016-06-17 21:47:58 UTC (rev 37743)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,9 +352,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // JS didn't send us everything we need to know. Just die with success message
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $total || ! $per_page || ! $page || ! $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $time = time();
- $comment = get_comment( $comment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $time = time();
+ $comment = get_comment( $comment_id );
+ $comment_status = '';
+ $comment_link = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $comment ) {
+ $comment_status = $comment->comment_approved;
+ }
+
+ if ( 1 === (int) $comment_status ) {
+ $comment_link = get_comment_link( $comment );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $counts = wp_count_comments();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $x = new WP_Ajax_Response( array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +372,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Here for completeness - not used.
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $comment_id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'supplemental' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'status' => $comment ? $comment->comment_approved : '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'status' => $comment_status,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'postId' => $comment ? $comment->comment_post_ID : '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'time' => $time,
</span><span class="cx" style="display: block; padding: 0 10px"> 'in_moderation' => $counts->moderated,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +383,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'i18n_moderation_text' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> _nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $counts->moderated )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ 'comment_link' => $comment_link,
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $x->send();
</span></span></pre></div>
<a id="trunksrcwpincludesjswplistsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/wp-lists.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/wp-lists.js 2016-06-17 20:46:08 UTC (rev 37742)
+++ trunk/src/wp-includes/js/wp-lists.js 2016-06-17 21:47:58 UTC (rev 37743)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,6 +297,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> res = wpAjax.parseAjaxResponse(r, s.response, s.element);
</span><span class="cx" style="display: block; padding: 0 10px"> rres = r;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'undefined' !== typeof res.responses[0].supplemental.comment_link ) {
+ var submittedOn = element.find( '.submitted-on' ),
+ commentLink = submittedOn.find( 'a' );
+
+ // Comment is approved; link the date field.
+ if ( '' !== res.responses[0].supplemental.comment_link ) {
+ submittedOn.html( $('<a></a>').text( submittedOn.text() ).prop( 'href', res.responses[0].supplemental.comment_link ) );
+
+ // Comment is not approved; unlink the date field.
+ } else if ( commentLink.length ) {
+ submittedOn.text( commentLink.text() );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !res || res.errors ) {
</span><span class="cx" style="display: block; padding: 0 10px"> element.stop().stop().css( 'backgroundColor', '#FF3333' )[isClass?'removeClass':'addClass'](s.dimClass).show().queue( function() { list.wpList.recolor(); $(this).dequeue(); } );
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>