<!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>[29662] trunk/src/wp-admin: Comments: Simplify JS for inline edit and reply.</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/29662">29662</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-09-02 03:56:05 +0000 (Tue, 02 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Comments: Simplify JS for inline edit and reply.
fixes <a href="http://core.trac.wordpress.org/ticket/27533">#27533</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminjseditcommentsjs">trunk/src/wp-admin/js/edit-comments.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php (29661 => 29662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2014-09-02 02:05:48 UTC (rev 29661)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2014-09-02 03:56:05 UTC (rev 29662)
</span><span class="lines">@@ -474,11 +474,11 @@
</span><span class="cx"> if ( 'spam' != $the_comment_status && 'trash' != $the_comment_status ) {
</span><span class="cx"> $actions['edit'] = "<a href='comment.php?action=editcomment&c={$comment->comment_ID}' title='" . esc_attr__( 'Edit comment' ) . "'>". __( 'Edit' ) . '</a>';
</span><span class="cx">
</span><del>- $format = '<a data-comment-id="%d" data-post-id="%d" class="%s" title="%s" href="#">%s</a>';
</del><ins>+ $format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" title="%s" href="#">%s</a>';
</ins><span class="cx">
</span><del>- $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'vim-q edit-comment-inline', esc_attr__( 'Quick Edit' ), __( 'Quick Edit' ) );
</del><ins>+ $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $post->ID, 'edit', 'vim-q comment-inline', esc_attr__( 'Quick Edit' ), __( 'Quick Edit' ) );
</ins><span class="cx">
</span><del>- $actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'vim-r reply-comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
</del><ins>+ $actions['reply'] = sprintf( $format, $comment->comment_ID, $post->ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-admin/includes/dashboard.php */
</span></span></pre></div>
<a id="trunksrcwpadminjseditcommentsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/edit-comments.js (29661 => 29662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/edit-comments.js 2014-09-02 02:05:48 UTC (rev 29661)
+++ trunk/src/wp-admin/js/edit-comments.js 2014-09-02 03:56:05 UTC (rev 29662)
</span><span class="lines">@@ -608,24 +608,18 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( typeof commentReply != 'undefined' ) {
</del><ins>+ // Quick Edit and Reply have an inline comment editor.
+ $( '#the-comment-list' ).on( 'click', '.comment-inline', function (e) {
+ e.preventDefault();
+ var $el = $( this ),
+ action = 'replyto';
</ins><span class="cx">
</span><del>- // Each "Quick Edit" link, open the comment editor
- $( 'body' ).on( 'click', '.comment .row-actions .quickedit .edit-comment-inline', function (e) {
- e.preventDefault();
</del><ins>+ if ( 'undefined' !== typeof $el.data( 'action' ) ) {
+ action = $el.data( 'action' );
+ }
</ins><span class="cx">
</span><del>- var $el = $( e.currentTarget );
- commentReply.open( $el.data( 'comment-id' ), $el.data( 'post-id' ), 'edit' );
- } );
-
- // Each "Reply" link, open the comment reply
- $( 'body' ).on( 'click', '.comment .row-actions .reply .reply-comment-inline', function (e) {
- e.preventDefault();
-
- var $el = $( e.currentTarget );
- commentReply.open( $el.data('comment-id'), $el.data('post-id') );
- } );
- }
</del><ins>+ commentReply.open( $el.data( 'commentId' ), $el.data( 'postId' ), action );
+ } );
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> })(jQuery);
</span></span></pre>
</div>
</div>
</body>
</html>