Ticket #41545: 41545.2.diff

src/wp-admin/js/edit-comments.js

@@ -580 +580 @@
 
                 $('a.cancel', row).click(function() { return commentReply.revert(); });
                 $('a.save', row).click(function() { return commentReply.send(); });
+
+                // Allow users to use Ctrl/Cmd+Enter to submit comment
+                $('#replycontent', editRow).keydown(function (e) {
+                        if (( e.metaKey || e.ctrlKey ) && e.keyCode == 13) {
+                                commentReply.send();
+                                e.preventDefault();
+                                return false;
+                        }
+                });
+
                 $( 'input#author-name, input#author-email, input#author-url', row ).keypress( function( e ) {
                         if ( e.which == 13 ) {
                                 commentReply.send();

src/wp-includes/comment-template.php

@@ -2215 +2215 @@
         $fields = apply_filters( 'comment_form_default_fields', $fields );
         $defaults = array(
                 'fields'               => $fields,
-                'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
+                'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required" onkeydown="return addComment.submitForm( event, \'comment\' )"></textarea></p>',
                 /** This filter is documented in wp-includes/link-template.php */
                 'must_log_in'          => '<p class="must-log-in">' . sprintf(
                                               /* translators: %s: login URL */

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

@@ -1 +1 @@
 var addComment = {
+        submitForm: function( e, textareaId ) {
+                if ( ( e.metaKey || e.ctrlKey ) && e.keyCode == 13 ) {
+                        var t           = this,
+                                textarea    = t.I( textareaId ),
+                                commentForm = t.I( textarea.form.id );
+
+                        document.createElement( 'form' ).submit.call( commentForm );
+                        e.preventDefault();
+                        return false;
+                }
+        },
+
         moveForm: function( commId, parentId, respondId, postId ) {
                 var div, element, style, cssHidden,
                         t           = this,