Ticket #31655: 31655.patch

src/wp-admin/js/post.js

@@ -204 +204 @@
         var stamp, visibility, $submitButtons, updateVisibility, updateText,
                 sticky = '',
                 last = 0,
-                co = $('#content'),
+                $textarea = $('#content'),
                 $document = $(document),
                 $editSlugWrap = $('#edit-slug-box'),
                 postId = $('#post_ID').val() || 0,
@@ -212 +212 @@
                 releaseLock = true,
                 $postVisibilitySelect = $('#post-visibility-select'),
                 $timestampdiv = $('#timestampdiv'),
-                $postStatusSelect = $('#post-status-select');
+                $postStatusSelect = $('#post-status-select'),
+                isMac = window.navigator.platform ? window.navigator.platform.indexOf( 'Mac' ) !== -1 : false;
 
         postboxes.add_postbox_toggles(pagenow);
 
@@ -313 +314 @@
 
         // This code is meant to allow tabbing from Title to Post content.
         $('#title').on( 'keydown.editor-focus', function( event ) {
-                var editor, $textarea;
+                var editor;
 
                 if ( event.keyCode === 9 && ! event.ctrlKey && ! event.altKey && ! event.shiftKey ) {
                         editor = typeof tinymce != 'undefined' && tinymce.get('content');
-                        $textarea = $('#content');
 
                         if ( editor && ! editor.isHidden() ) {
                                 editor.focus();
@@ -790 +790 @@
 
         // word count
         if ( typeof(wpWordCount) != 'undefined' ) {
-                $document.triggerHandler('wpcountwords', [ co.val() ]);
+                $document.triggerHandler('wpcountwords', [ $textarea.val() ]);
 
-                co.keyup( function(e) {
+                $textarea.keyup( function(e) {
                         var k = e.keyCode || e.charCode;
 
                         if ( k == last )
@@ -799 +799 @@
                                 return true;
 
                         if ( 13 == k || 8 == last || 46 == last )
-                                $document.triggerHandler('wpcountwords', [ co.val() ]);
+                                $document.triggerHandler('wpcountwords', [ $textarea.val() ]);
 
                         last = k;
                         return true;
@@ -835 +835 @@
         // Resize the visual and text editors
         ( function() {
                 var editor, offset, mce,
-                        $textarea = $('textarea#content'),
                         $handle = $('#post-status-info'),
                         $postdivrich = $('#postdivrich');
 
@@ -923 +922 @@
                         }
                 });
         }
+
+        // Save on pressing Ctrl/Command + S in the Text editor
+        $textarea.on( 'keydown.wp-autosave', function( event ) {
+                if ( event.which === 83 ) {
+                        if ( event.shiftKey || event.altKey || ( isMac && ( ! event.metaKey || event.ctrlKey ) ) || ( ! isMac && ! event.ctrlKey ) ) {
+                                return;
+                        }
+
+                        wp.autosave && wp.autosave.server.triggerSave();
+                        event.preventDefault();
+                }
+        });
 });