Ticket #30515: 30515.patch

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

@@ -315 +315 @@
 
                 // Adjust the toolbars based on the active editor mode.
                 function adjust( event ) {
-                        var type = event && event.type;
-
                         // Make sure we're not in fullscreen mode.
                         if ( fullscreen && fullscreen.settings.visible ) {
                                 return;
@@ -323 +321 @@
                         }
 
                         var windowPos = $window.scrollTop(),
+                                type = event && event.type,
                                 resize = type !== 'scroll',
                                 visual = ( mceEditor && ! mceEditor.isHidden() ),
                                 buffer = autoresizeMinHeight,
@@ -467 +466 @@
                                                 // +[n] for the border around the .wp-editor-container.
                                                 ( windowPos + heights.windowHeight ) <= ( editorPos + editorHeight + heights.bottomHeight + heights.statusBarHeight + borderWidth ) ) {
 
-                                        if ( event && event.deltaHeight > 0 ) {
-                                                window.scrollBy( 0, event.deltaHeight );
-                                        } else if ( advanced ) {
+                                        if ( advanced ) {
                                                 fixedBottom = true;
 
                                                 $statusBar.css( {
@@ -492 +489 @@
 
                                         $statusBar.add( $bottom ).attr( 'style', '' );
 
-                                        ! advanced && $statusBar.css( 'visibility', 'hidden' );
+                                        if ( ! advanced ) {
+                                                $statusBar.css( 'visibility', 'hidden' );
+                                        }
                                 }
                         }