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

TinyMCE: fix inline toolbar positioning 

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

Fixes #36876.



git-svn-id: https://develop.svn.wordpress.org/trunk@37559 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ella Iseulde Van Dorpe 2016-05-25 15:12:28 +00:00
parent 0decd27a3f
commit 73e91b1ad3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/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' ) {
activeToolbar.hide();
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 );
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.on( 'remove', function() {
DOM.unbind( window, 'resize scroll', hide );
editor.off( 'resizewindow scrollwindow', hide );
editor.dom.unbind( editor.getWin(), 'resize scroll', hide );
} );