<!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>[35593] trunk/src/wp-includes/js/comment-reply.js: Comments: in `comment_form()` when replying to a comment ensure to set focus on the first focusable form element, regardless of what that form element is.</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/35593">35593</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/35593","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>2015-11-10 00:43:01 +0000 (Tue, 10 Nov 2015)</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: in `comment_form()` when replying to a comment ensure to set focus on the first focusable form element, regardless of what that form element is.
Props azaozz.
See <a href="https://core.trac.wordpress.org/ticket/29974">#29974</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjscommentreplyjs">trunk/src/wp-includes/js/comment-reply.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjscommentreplyjs"></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/comment-reply.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/comment-reply.js 2015-11-09 23:33:06 UTC (rev 35592)
+++ trunk/src/wp-includes/js/comment-reply.js 2015-11-10 00:43:01 UTC (rev 35593)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,47 +1,92 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var addComment = {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- moveForm : function(commId, parentId, respondId, postId) {
- var t = this, div, comm = t.I(commId), respond = t.I(respondId), cancel = t.I('cancel-comment-reply-link'), parent = t.I('comment_parent'), post = t.I('comment_post_ID');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ moveForm: function( commId, parentId, respondId, postId ) {
+ var div, element, node, style, cssHidden,
+ t = this,
+ comm = t.I( commId ),
+ respond = t.I( respondId ),
+ cancel = t.I( 'cancel-comment-reply-link' ),
+ parent = t.I( 'comment_parent' ),
+ post = t.I( 'comment_post_ID' ),
+ commentForm = respond.getElementsByTagName( 'form' )[0];
</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 ( ! comm || ! respond || ! cancel || ! parent )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! comm || ! respond || ! cancel || ! parent || ! commentForm ) {
</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><span class="cx" style="display: block; padding: 0 10px"> t.respondId = respondId;
</span><span class="cx" style="display: block; padding: 0 10px"> postId = postId || false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! t.I('wp-temp-form-div') ) {
- div = document.createElement('div');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! t.I( 'wp-temp-form-div' ) ) {
+ div = document.createElement( 'div' );
</ins><span class="cx" style="display: block; padding: 0 10px"> div.id = 'wp-temp-form-div';
</span><span class="cx" style="display: block; padding: 0 10px"> div.style.display = 'none';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- respond.parentNode.insertBefore(div, respond);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ respond.parentNode.insertBefore( div, respond );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- comm.parentNode.insertBefore(respond, comm.nextSibling);
- if ( post && postId )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ comm.parentNode.insertBefore( respond, comm.nextSibling );
+ if ( post && postId ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> post.value = postId;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> parent.value = parentId;
</span><span class="cx" style="display: block; padding: 0 10px"> cancel.style.display = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> cancel.onclick = function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var t = addComment, temp = t.I('wp-temp-form-div'), respond = t.I(t.respondId);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var t = addComment,
+ temp = t.I( 'wp-temp-form-div' ),
+ respond = t.I( t.respondId );
</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 ( ! temp || ! respond )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! temp || ! respond ) {
</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">- t.I('comment_parent').value = '0';
- temp.parentNode.insertBefore(respond, temp);
- temp.parentNode.removeChild(temp);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ t.I( 'comment_parent' ).value = '0';
+ temp.parentNode.insertBefore( respond, temp );
+ temp.parentNode.removeChild( temp );
</ins><span class="cx" style="display: block; padding: 0 10px"> this.style.display = 'none';
</span><span class="cx" style="display: block; padding: 0 10px"> this.onclick = null;
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- try { t.I('comment').focus(); }
- catch(e) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set initial focus to the first form focusable element.
+ try {
+ for ( var i = 0; i < commentForm.elements.length; i++ ) {
+ element = commentForm.elements[i];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Skip form elements that are hidden or disabled.
+ if ( 'hidden' === element.type || element.hasAttribute( 'disabled' ) ) {
+ continue;
+ }
+
+ if ( 'getComputedStyle' in window ) {
+ node = element;
+ cssHidden = false;
+
+ while( node.parentNode ) {
+ style = window.getComputedStyle( node );
+
+ if ( style.display === 'none' || style.visibility === 'hidden' ) {
+ cssHidden = true;
+ break;
+ }
+
+ node = node.parentNode;
+ }
+
+ if ( cssHidden ) {
+ continue;
+ }
+ }
+
+ element.focus();
+ // Stop after the first focusable element.
+ break;
+ }
+ } catch( er ) {}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- I : function(e) {
- return document.getElementById(e);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ I: function( id ) {
+ return document.getElementById( id );
</ins><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>