Ticket #29974: 29974.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');
+                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 )
                         return;
@@ -35 +42 @@
                         return false;
                 };
 
-                try { t.I('comment').focus(); }
-                catch(e) {}
+                try {
+                        for ( var i = 0; i < commentForm.elements.length; i++ ) {
+                                if ( 'hidden' === commentForm.elements[i].type || true === commentForm.elements[i].disabled ) {
+                                        continue;
+                                }
+                                commentForm.elements[i].focus();
+                                respond.scrollIntoView();
+                                break;
+                        }
+                } catch(e) {}
 
                 return false;
         },
-
         I : function(e) {
                 return document.getElementById(e);
         }