Ticket #28328: 28328.16.patch

src/wp-admin/js/editor-expand.js

@@ -117 +117 @@
                 // Adjust when switching editor modes.
                 editor.on( 'show', function() {
                         setTimeout( function() {
-                                editor.execCommand( 'mceAutoResize' );
+                                editor.execCommand( 'wpAutoResize' );
                                 adjust( 'resize' );
                         }, 200 );
                 } );
 
-                editor.on( 'keyup', function() {
-                        var offset = getCursorOffset(),
+                // Make sure the cursor is always visible.
+                // This is not only necessary to keep the cursor between the toolbars,
+                // but also to scroll the window when the cursor moves out of the viewport to a wpview.
+                // Setting a buffer > 0 will prevent the browser default.
+                // Some browsers will scroll to the middle,
+                // others to the top/bottom of the *window* when moving the cursor out of the viewport.
+                editor.on( 'keyup', function( event ) {
+                        var VK = tinymce.util.VK,
+                                key = event.keyCode,
+                                offset = getCursorOffset(),
                                 windowHeight = $window.height(),
+                                buffer = 10,
                                 cursorTop, cursorBottom, editorTop, editorBottom;
 
                         if ( ! offset ) {
@@ -133 +142 @@
 
                         cursorTop = offset.top + editor.getContentAreaContainer().getElementsByTagName( 'iframe' )[0].getBoundingClientRect().top;
                         cursorBottom = cursorTop + offset.height;
+                        cursorTop = cursorTop - buffer;
+                        cursorBottom = cursorBottom + buffer;
                         editorTop = $adminBar.outerHeight() + $tools.outerHeight() + $visualTop.outerHeight();
-                        editorBottom = $window.height() - $bottom.outerHeight();
+                        editorBottom = windowHeight - $bottom.outerHeight();
 
-                        if ( cursorTop < editorTop || cursorBottom > editorBottom ) {
-                                window.scrollTo( window.pageXOffset, cursorTop + window.pageYOffset - windowHeight / 2 );
+                        if ( cursorTop < editorTop && ( key === VK.UP || key === VK.LEFT ) ) {
+                                window.scrollTo( window.pageXOffset, cursorTop + window.pageYOffset - editorTop );
+                        } else if ( cursorBottom > editorBottom && ( key === VK.DOWN || key === VK.RIGHT ) ) {
+                                window.scrollTo( window.pageXOffset, cursorBottom + window.pageYOffset - editorBottom );
                         }
                 } );
 
@@ -145 +158 @@
                         var selection = editor.selection,
                                 node = selection.getNode(),
                                 range = selection.getRng(),
-                                view, clone, right, offset;
+                                view, clone, offset;
 
                         if ( tinymce.Env.ie && tinymce.Env.ie < 9 ) {
                                 return;
@@ -159 +172 @@
                                 if ( clone.startContainer.length > 1 ) {
                                         if ( clone.startContainer.length > clone.endOffset ) {
                                                 clone.setEnd( clone.startContainer, clone.endOffset + 1 );
-                                                right = true;
                                         } else {
                                                 clone.setStart( clone.startContainer, clone.endOffset - 1 );
                                         }
@@ -175 +187 @@
                         }
 
                         if ( ! offset.height ) {
-                                return false;
+                                return;
                         }
 
                         return offset;

src/wp-includes/js/tinymce/plugins/wpautoresize/plugin.js

@@ -140 +140 @@
                 editor.on( 'init', function() {
                         editor.dom.addClass( editor.getBody(), 'wp-autoresize' );
                 });
-                
-                editor.on( 'nodechange setcontent keyup FullscreenStateChanged', resize );
-        
+
+                editor.on( 'nodechange keyup FullscreenStateChanged', resize );
+
+                editor.on( 'setcontent', function() {
+                        wait( 3, 100 );
+                });
+
                 if ( editor.getParam( 'autoresize_on_init', true ) ) {
                         editor.on( 'init', function() {
                                 // Hit it 20 times in 100 ms intervals

src/wp-includes/js/tinymce/plugins/wpview/plugin.js

@@ -266 +266 @@
                         selection.collapse( true );
                 });
 
-                // When the selection's content changes, scan any new content for matching views.
-                // Runs on paste and on inserting nodes/html.
-                editor.on( 'SetContent', function( e ) {
-                        if ( ! e.context ) {
-                                return;
-                        }
-
-                        var node = selection.getNode();
-
-                        if ( ! node.innerHTML ) {
-                                return;
-                        }
-
-                        node.innerHTML = wp.mce.views.toViews( node.innerHTML );
-                });
-
                 editor.dom.bind( editor.getBody().parentNode, 'mousedown mouseup click', function( event ) {
                         var view = getView( event.target ),
                                 deselectEventType;
@@ -327 +311 @@
         });
 
         editor.on( 'PreProcess', function( event ) {
-                // Replace the wpview node with the wpview string/shortcode?
+                // Replace the wpview node with the wpview string/shortcode.
                 tinymce.each( editor.dom.select( 'div[data-wpview-text]', event.node ), function( node ) {
                         // Empty the wrap node
                         if ( 'textContent' in node ) {