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

TinyMCE: fix inline toolbar positioning 

Introduced in [37000].
See 2fb8aa48e9.
See 5734a8d880.

Fixes #36876.


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


git-svn-id: http://core.svn.wordpress.org/trunk@37527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ella Iseulde Van Dorpe 2016-05-25 15:13:28 +00:00
parent 62d4798863
commit cf51b75834
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/js/tinymce/plugins/wordpress/plugin.js
View File

@ -902,7 +902,12 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
if ( activeToolbar.tempHide || event.type === 'hide' ) { if ( activeToolbar.tempHide || event.type === 'hide' ) {
activeToolbar.hide(); activeToolbar.hide();
activeToolbar = false; activeToolbar = false;
} else if ( ( event.type === 'resize' || event.type === 'scroll' ) && ! activeToolbar.blockHide ) { } else if ( (
event.type === 'resizewindow' ||
event.type === 'scrollwindow' ||
event.type === 'resize' ||
event.type === 'scroll'
) && ! activeToolbar.blockHide ) {
clearTimeout( timeout ); clearTimeout( timeout );
timeout = setTimeout( function() { timeout = setTimeout( function() {
@ -918,11 +923,13 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
} }
} }
DOM.bind( window, 'resize scroll', hide ); // For full height editor.
editor.on( 'resizewindow scrollwindow', hide );
// For scrollable editor.
editor.dom.bind( editor.getWin(), 'resize scroll', hide ); editor.dom.bind( editor.getWin(), 'resize scroll', hide );
editor.on( 'remove', function() { editor.on( 'remove', function() {
DOM.unbind( window, 'resize scroll', hide ); editor.off( 'resizewindow scrollwindow', hide );
editor.dom.unbind( editor.getWin(), 'resize scroll', hide ); editor.dom.unbind( editor.getWin(), 'resize scroll', hide );
} ); } );

2
wp-includes/js/tinymce/plugins/wordpress/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-alpha-37558'; $wp_version = '4.6-alpha-37559';
/** /**
* 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.