Changeset 37559

Timestamp:

05/25/2016 03:12:28 PM (10 years ago)

Author:

iseulde

Message:

TinyMCE: fix inline toolbar positioning

Introduced in [37000].
See ​https://github.com/tinymce/tinymce/commit/2fb8aa48e91101bd3ca4ff2d532bca3a8665fb24.
See ​https://github.com/tinymce/tinymce/commit/5734a8d8805d69ee87dd1cad7263244968194601.

Fixes #36876.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (2 diffs)

trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -903 +903 @@
                                         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 );
 
@@ -919 +924 @@
                 }
 
-                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 );
                 } );