Changeset 30586

Timestamp:

11/27/2014 12:59:04 AM (11 years ago)

Author:

azaozz

Message:

Editor: limit scrolling triggered when TinyMCE is auto-resized to 100px. Prevents auto-scrolling on page load. Fixes #30515.

File:

• trunk/src/wp-admin/js/editor-expand.js (modified) (4 diffs)

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

@@ -316 +316 @@
         // 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 ) {
@@ -324 +322 @@
 
             var windowPos = $window.scrollTop(),
+                type = event && event.type,
                 resize = type !== 'scroll',
                 visual = ( mceEditor && ! mceEditor.isHidden() ),
@@ -468 +467 @@
                         ( windowPos + heights.windowHeight ) <= ( editorPos + editorHeight + heights.bottomHeight + heights.statusBarHeight + borderWidth ) ) {
 
-                    if ( event && event.deltaHeight > 0 ) {
+                    if ( event && event.deltaHeight > 0 && event.deltaHeight < 100 ) {
                         window.scrollBy( 0, event.deltaHeight );
                     } else if ( advanced ) {
@@ -493 +492 @@
                     $statusBar.add( $bottom ).attr( 'style', '' );
 
-                    ! advanced && $statusBar.css( 'visibility', 'hidden' );
+                    if ( ! advanced ) {
+                        $statusBar.css( 'visibility', 'hidden' );
+                    }
                 }
             }