Ticket #29838: 29838.patch

src/js/_enqueues/admin/post.js

@@ -434 +434 @@
                 $previewField.val('');
         });
 
-        // This code is meant to allow tabbing from Title to Post content.
-        $('#title').on( 'keydown.editor-focus', function( event ) {
-                var editor;
-
-                if ( event.keyCode === 9 && ! event.ctrlKey && ! event.altKey && ! event.shiftKey ) {
-                        editor = typeof tinymce != 'undefined' && tinymce.get('content');
-
-                        if ( editor && ! editor.isHidden() ) {
-                                editor.focus();
-                        } else if ( $textarea.length ) {
-                                $textarea.trigger( 'focus' );
-                        } else {
-                                return;
-                        }
-
-                        event.preventDefault();
-                }
-        });
-
         // Auto save new posts after a title is typed.
         if ( $( '#auto_draft' ).val() ) {
                 $( '#title' ).on( 'blur', function() {

src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js

@@ -1074 +1074 @@
                         }
                 } );
 
+                editor.on( 'keydown', function( event ) {
++                       if ( event.keyCode === 9 && event.shiftKey ) {
++                               var toolbar = editor.theme.panel.find( '.toolbar:not(.menubar)' )[0];
++                               if ( toolbar ) {
++                                       toolbar.focus( true );
++                               }
++                       }
++               });
+
                 editor.on( 'nodechange', function( event ) {
                         var collapsed = editor.selection.isCollapsed();
 

src/js/_enqueues/wp/editor/base.js

@@ -103 +103 @@
 
                                 editorHeight = parseInt( textarea.style.height, 10 ) || 0;
 
-                                var keepSelection = false;
-                                if ( editor ) {
-                                        keepSelection = editor.getParam( 'wp_keep_scroll_position' );
-                                } else {
-                                        keepSelection = window.tinyMCEPreInit.mceInit[ id ] &&
-                                                                        window.tinyMCEPreInit.mceInit[ id ].wp_keep_scroll_position;
-                                }
-
-                                if ( keepSelection ) {
-                                        // Save the selection.
-                                        addHTMLBookmarkInTextAreaContent( $textarea );
-                                }
+                                addHTMLBookmarkInTextAreaContent( $textarea );
 
                                 if ( editor ) {
                                         editor.show();
@@ -130 +119 @@
                                                 }
                                         }
 
-                                        if ( editor.getParam( 'wp_keep_scroll_position' ) ) {
-                                                // Restore the selection.
-                                                focusHTMLBookmarkInVisualEditor( editor );
-                                        }
+                                        // Restore the selection.
++                                       focusHTMLBookmarkInVisualEditor( editor );
                                 } else {
                                         tinymce.init( window.tinyMCEPreInit.mceInit[ id ] );
                                 }
@@ -168 +155 @@
 
                                         var selectionRange = null;
 
-                                        if ( editor.getParam( 'wp_keep_scroll_position' ) ) {
-                                                selectionRange = findBookmarkedPosition( editor );
-                                        }
+                                        selectionRange = findBookmarkedPosition( editor );
 
                                         editor.hide();
 
@@ -520 +505 @@
                  * Focuses the selection markers in Visual mode.
                  *
                  * The method checks for existing selection markers inside the editor DOM (Visual mode)
-                 * and create a selection between the two nodes using the DOM `createRange` selection API
+                 * and create a selection between the two nodes using the DOM `createRange` selection API.
                  *
                  * If there is only a single node, select only the single node through TinyMCE's selection API
                  *
@@ -545 +530 @@
                                 }
                         }
 
-                        if ( editor.getParam( 'wp_keep_scroll_position' ) ) {
-                                scrollVisualModeToStartElement( editor, startNode );
-                        }
+                        scrollVisualModeToStartElement( editor, startNode );
 
                         removeSelectionMarker( startNode );
                         removeSelectionMarker( endNode );

src/wp-admin/edit-form-advanced.php

@@ -621 +621 @@
                 array(
                         '_content_editor_dfw' => $_content_editor_dfw,
                         'drag_drop_upload'    => true,
-                        'tabfocus_elements'   => 'content-html,save-post',
                         'editor_height'       => 300,
                         'tinymce'             => array(
                                 'resize'                  => false,
                                 'wp_autoresize_on'        => $_wp_editor_expand,
                                 'add_unload_trigger'      => false,
-                                'wp_keep_scroll_position' => ! $is_IE,
                         ),
                 )
         );

src/wp-includes/class-wp-editor.php

@@ -1113 +1113 @@
                         'end_container_on_empty_block' => true,
                         'wpeditimage_html5_captions'   => true,
                         'wp_lang_attr'                 => get_bloginfo( 'language' ),
-                        'wp_keep_scroll_position'      => false,
                         'wp_shortcut_labels'           => wp_json_encode( $shortcut_labels ),
                 );