Ticket #29974: 29974.5.patch

src/wp-includes/js/comment-reply.js

@@ -1 +1 @@
 var addComment = {
-        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');
+        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' ),
+                        commentForm = respond.getElementsByTagName( 'form' )[0];
 
-                if ( ! comm || ! respond || ! cancel || ! parent )
+                if ( ! comm || ! respond || ! cancel || ! parent || ! commentForm ) {
                         return;
+                }
 
                 t.respondId = respondId;
                 postId = postId || false;
 
-                if ( ! t.I('wp-temp-form-div') ) {
-                        div = document.createElement('div');
+                if ( ! t.I( 'wp-temp-form-div' ) ) {
+                        div = document.createElement( 'div' );
                         div.id = 'wp-temp-form-div';
                         div.style.display = 'none';
-                        respond.parentNode.insertBefore(div, respond);
+                        respond.parentNode.insertBefore( div, respond );
                 }
 
-                comm.parentNode.insertBefore(respond, comm.nextSibling);
-                if ( post && postId )
+                comm.parentNode.insertBefore( respond, comm.nextSibling );
+                if ( post && postId ) {
                         post.value = postId;
+                }
                 parent.value = parentId;
                 cancel.style.display = '';
 
                 cancel.onclick = function() {
-                        var t = addComment, temp = t.I('wp-temp-form-div'), respond = t.I(t.respondId);
+                        var t       = addComment,
+                                temp    = t.I( 'wp-temp-form-div' ),
+                                respond = t.I( t.respondId );
 
-                        if ( ! temp || ! respond )
+                        if ( ! temp || ! respond ) {
                                 return;
+                        }
 
-                        t.I('comment_parent').value = '0';
-                        temp.parentNode.insertBefore(respond, temp);
-                        temp.parentNode.removeChild(temp);
+                        t.I( 'comment_parent' ).value = '0';
+                        temp.parentNode.insertBefore( respond, temp );
+                        temp.parentNode.removeChild( temp );
                         this.style.display = 'none';
                         this.onclick = null;
                         return false;
                 };
 
-                try { t.I('comment').focus(); }
-                catch(e) {}
+                // Set initial focus to the first form focusable element.
+                try {
+                        for ( var i = 0; i < commentForm.elements.length; i++ ) {
+                        // Skip form elements with `hidden` type attribute and disabled ones.
+                        // @todo Consider to skip also readonly elements and elements hidden with CSS?
+                        if ( 'hidden' === commentForm.elements[i].type || true === commentForm.elements[i].disabled ) {
+                                        continue;
+                                }
+                                commentForm.elements[i].focus();
+                                respond.scrollIntoView();
+                                // Stop after the first focusable element.
+                                break;
+                        }
+                } catch( er ) {}
 
                 return false;
         },
 
-        I : function(e) {
-                return document.getElementById(e);
+        I: function( el ) {
+                return document.getElementById( el );
         }
 };