sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@30586 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2014-11-27 00:59:04 +00:00
parent fffff63fbe
commit 19ed0a7c1a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wp-admin/js/editor-expand.js
View File

@ -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' );
}
}
}