WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Built from https://develop.svn.wordpress.org/trunk@30586


git-svn-id: http://core.svn.wordpress.org/trunk@30576 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-11-27 01:00:25 +00:00
parent 213ecc8a07
commit 4d651b90bb
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
wp-admin/js/editor-expand.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.1-beta2-30585'; $wp_version = '4.1-beta2-30586';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.