Ticket #29293: 29293.2.patch

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

@@ -163 +163 @@
                         cursorTop = cursorTop - buffer;
                         cursorBottom = cursorBottom + buffer;
                         editorTop = $adminBar.outerHeight() + $tools.outerHeight() + $visualTop.outerHeight();
-                        editorBottom = windowHeight - $bottom.outerHeight();
+                        editorBottom = windowHeight - $bottom.outerHeight() - $statusBar.outerHeight();
 
                         // Don't scroll if the node is taller than the visible part of the editor
                         if ( editorBottom - editorTop < offset.height ) {
@@ -268 +268 @@
                                         width: contentWrapWidth
                                 } );
 
+                                if ( visual && $statusBar.length ) {
+                                        $statusBar.css( {
+                                                position: '',
+                                                bottom: '',
+                                                width: ''
+                                        } );
+                                }
+
                                 $bottom.css( {
                                         position: 'relative',
                                         bottom: 'auto',
@@ -335 +343 @@
 
                         // Maybe adjust the bottom bar.
                         if ( ( ! fixedBottom || resize ) &&
-                                // +[n] for the border around the .wp-editor-container.
-                                ( windowPos + windowHeight ) <= ( editorPos + editorHeight + bottomHeight + statusBarHeight + borderWidth ) ) {
-
+                                        // +[n] for the border around the .wp-editor-container.
+                                        ( windowPos + windowHeight ) <= ( editorPos + editorHeight + bottomHeight + statusBarHeight + borderWidth ) ) {
                                 fixedBottom = true;
 
+                                if ( visual && $statusBar.length ) {
+                                        $statusBar.css( {
+                                                position: 'fixed',
+                                                bottom: bottomHeight,
+                                                width: contentWrapWidth - ( borderWidth * 2 )
+                                        } );
+                                }
+
                                 $bottom.css( {
                                         position: 'fixed',
                                         bottom: 0,
@@ -350 +365 @@
                                         ( windowPos + windowHeight ) > ( editorPos + editorHeight + bottomHeight + statusBarHeight - borderWidth ) ) {
                                 fixedBottom = false;
 
+                                if ( visual && $statusBar.length ) {
+                                        $statusBar.css( {
+                                                position: '',
+                                                bottom: '',
+                                                width: ''
+                                        } );
+                                }
+
                                 $bottom.css( {
                                         position: 'relative',
                                         bottom: 'auto',
@@ -554 +577 @@
                 fullscreen && fullscreen.pubsub.unsubscribe( 'hidden', fullscreenHide );
 
                 // Reset all css
-                $.each( [ $visualTop, $textTop, $tools, $bottom, $contentWrap, $visualEditor, $textEditor, $sideSortables ], function( i, element ) {
+                $.each( [ $visualTop, $textTop, $tools, $bottom, $statusBar, $contentWrap, $visualEditor, $textEditor, $sideSortables ], function( i, element ) {
                         element && element.attr( 'style', '' );
                 });