<!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>[42767] trunk/src/wp-admin: Accessibility: Change the comments "Quick Edit" and "Reply" links to buttons.</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/42767">42767</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/42767","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>afercia</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-28 22:36:00 +0000 (Wed, 28 Feb 2018)</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'>Accessibility: Change the comments "Quick Edit" and "Reply" links to buttons.
For better accessibility and semantics, user interface controls that perform an
action should be buttons. Links should exclusively be used for navigation.
Props Cheffeid, audrasjb, afercia.
See <a href="https://core.trac.wordpress.org/ticket/43382">#43382</a>, <a href="https://core.trac.wordpress.org/ticket/38677">#38677</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/43376">#43376</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 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2018-02-28 03:47:14 UTC (rev 42766)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2018-02-28 22:36:00 UTC (rev 42767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,7 +635,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['edit'] = "<a href='comment.php?action=editcomment&c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>" . __( 'Edit' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" aria-label="%s" href="#">%s</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $format = '<button type="button" data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s button-link" aria-expanded="false" aria-label="%s">%s</button>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'edit', 'vim-q comment-inline', esc_attr__( 'Quick edit this comment inline' ), __( 'Quick Edit' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminjseditcommentsjs"></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/js/edit-comments.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/edit-comments.js 2018-02-28 03:47:14 UTC (rev 42766)
+++ trunk/src/wp-admin/js/edit-comments.js 2018-02-28 22:36:00 UTC (rev 42767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,31 +632,53 @@
</span><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"> close : function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var c, replyrow = $('#replyrow');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var commentRow = $(),
+ replyRow = $( '#replyrow' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // replyrow is not showing?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( replyrow.parent().is('#com-reply') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( replyRow.parent().is( '#com-reply' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( this.cid && this.act == 'edit-comment' ) {
- c = $('#comment-' + this.cid);
- c.fadeIn(300, function(){ c.show(); }).css('backgroundColor', '');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( this.cid ) {
+ commentRow = $( '#comment-' + this.cid );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * When closing the Quick Edit form, show the comment row and move focus
+ * back to the Quick Edit button.
+ */
+ if ( 'edit-comment' === this.act ) {
+ commentRow.fadeIn( 300, function() {
+ commentRow
+ .show()
+ .find( '.vim-q' )
+ .attr( 'aria-expanded', 'false' )
+ .focus();
+ } ).css( 'backgroundColor', '' );
+ }
+
+ // When closing the Reply form, move focus back to the Reply button.
+ if ( 'replyto-comment' === this.act ) {
+ commentRow.find( '.vim-r' )
+ .attr( 'aria-expanded', 'false' )
+ .focus();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // reset the Quicktags buttons
</span><span class="cx" style="display: block; padding: 0 10px"> if ( typeof QTags != 'undefined' )
</span><span class="cx" style="display: block; padding: 0 10px"> QTags.closeAllTags('replycontent');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $('#add-new-comment').css('display', '');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- replyrow.hide();
- $('#com-reply').append( replyrow );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ replyRow.hide();
+ $( '#com-reply' ).append( replyRow );
</ins><span class="cx" style="display: block; padding: 0 10px"> $('#replycontent').css('height', '').val('');
</span><span class="cx" style="display: block; padding: 0 10px"> $('#edithead input').val('');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.notice-error', replyrow )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.notice-error', replyRow )
</ins><span class="cx" style="display: block; padding: 0 10px"> .addClass( 'hidden' )
</span><span class="cx" style="display: block; padding: 0 10px"> .find( '.error' ).empty();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.spinner', replyrow ).removeClass( 'is-active' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.spinner', replyRow ).removeClass( 'is-active' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.cid = '';
</span><span class="cx" style="display: block; padding: 0 10px"> this.originalContent = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -960,8 +982,7 @@
</span><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"> // Quick Edit and Reply have an inline comment editor.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '#the-comment-list' ).on( 'click', '.comment-inline', function (e) {
- e.preventDefault();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#the-comment-list' ).on( 'click', '.comment-inline', function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var $el = $( this ),
</span><span class="cx" style="display: block; padding: 0 10px"> action = 'replyto';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -969,6 +990,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> action = $el.data( 'action' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( this ).attr( 'aria-expanded', 'true' );
</ins><span class="cx" style="display: block; padding: 0 10px"> commentReply.open( $el.data( 'commentId' ), $el.data( 'postId' ), action );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre>
</div>
</div>
</body>
</html>