From 19ed0a7c1a9de781ef35f1c7dfeea786e6e5094f Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Thu, 27 Nov 2014 00:59:04 +0000 Subject: [PATCH] Editor: limit scrolling triggered when TinyMCE is auto-resized to 100px. Prevents auto-scrolling on page load. Fixes #30515. git-svn-id: https://develop.svn.wordpress.org/trunk@30586 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/editor-expand.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/js/editor-expand.js b/src/wp-admin/js/editor-expand.js index 7cec72d21a..946951b6d6 100644 --- a/src/wp-admin/js/editor-expand.js +++ b/src/wp-admin/js/editor-expand.js @@ -315,14 +315,13 @@ // 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; } var windowPos = $window.scrollTop(), + type = event && event.type, resize = type !== 'scroll', visual = ( mceEditor && ! mceEditor.isHidden() ), buffer = autoresizeMinHeight, @@ -467,7 +466,7 @@ // +[n] for the border around the .wp-editor-container. ( 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 ) { fixedBottom = true; @@ -492,7 +491,9 @@ $statusBar.add( $bottom ).attr( 'style', '' ); - ! advanced && $statusBar.css( 'visibility', 'hidden' ); + if ( ! advanced ) { + $statusBar.css( 'visibility', 'hidden' ); + } } }