Ticket #32604: 32604.12.patch

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

@@ -443 +443 @@
          * Experimental: create a floating toolbar.
          * This functionality will change in the next releases. Not recommended for use by plugins.
          */
-        ( function() {
+        editor.on( 'preinit', function() {
                 var Factory = tinymce.ui.Factory,
                         settings = editor.settings,
                         activeToolbar,
                         currentSelection,
+                        timeout,
                         wpAdminbar = document.getElementById( 'wpadminbar' ),
-                        mceIframe, mceToolbar, mceStatusbar, wpStatusbar;
-
-                editor.on( 'init', function() {
-                        mceIframe = document.getElementById( editor.id + '_ifr' );
-                        mceToolbar = tinymce.$( '.mce-toolbar-grp', editor.getContainer() )[0];
-                        mceStatusbar = tinymce.$( '.mce-statusbar', editor.getContainer() )[0];
+                        mceIframe = document.getElementById( editor.id + '_ifr' ),
+                        mceToolbar = tinymce.$( '.mce-toolbar-grp', editor.getContainer() )[0],
+                        mceStatusbar = tinymce.$( '.mce-statusbar', editor.getContainer() )[0],
+                        wpStatusbar;
 
                         if ( editor.id === 'content' ) {
                                 wpStatusbar = document.getElementById( 'post-status-info' );
                         }
-                } );
 
                 function create( buttons, bottom ) {
                         var toolbar,
@@ -587 +585 @@
 
                         toolbar.bottom = bottom;
 
-                        function hide() {
-                                toolbar.hide();
-                        }
-
                         function reposition() {
                                 var scrollX = window.pageXOffset || document.documentElement.scrollLeft,
                                         scrollY = window.pageYOffset || document.documentElement.scrollTop,
@@ -617 +611 @@
                                         className = '',
                                         top, left;
 
+                                if ( spaceTop >= editorHeight || spaceBottom >= editorHeight ) {
+                                        return this.hide();
+                                }
+
                                 if ( this.bottom ) {
                                         if ( spaceBottom >= spaceNeeded ) {
                                                 className = ' mce-arrow-up';
@@ -677 +675 @@
                                 }
                         } );
 
-                        toolbar.on( 'remove', function() {
-                                DOM.unbind( window, 'resize scroll', hide );
-                                editor.dom.unbind( editor.getWin(), 'resize scroll', hide );
-                                editor.off( 'blur hide', hide );
-                        } );
-
-                        editor.once( 'init', function() {
-                                DOM.bind( window, 'resize scroll', hide );
-                                editor.dom.bind( editor.getWin(), 'resize scroll', hide );
-                                editor.on( 'blur hide', hide );
-                        } );
-
                         toolbar.reposition = reposition;
                         toolbar.hide().renderTo( document.body );
 
@@ -735 +721 @@
                         }
                 } );
 
-                editor.on( 'hide', function() {
-                        activeToolbar = false;
-                } );
+                function hide( event ) {
+                        if ( activeToolbar ) {
+                                activeToolbar.hide();
+
+                                if ( event.type === 'hide' ) {
+                                        activeToolbar = false;
+                                } else if ( event.type === 'resize' || event.type === 'scroll' ) {
+                                        clearTimeout( timeout );
+
+                                        timeout = setTimeout( function() {
+                                                activeToolbar.show();
+                                        }, 250 );
+                                }
+                        }
+                }
+
+                DOM.bind( window, 'resize scroll', hide );
+                editor.dom.bind( editor.getWin(), 'resize scroll', hide );
+                editor.on( 'blur hide', hide );
 
                 editor.wp = editor.wp || {};
                 editor.wp._createToolbar = create;
-        }());
+        }, true );
 
         function noop() {}