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

TinyMCE: show inline toolbar after scroll/resize

Browse Source 
Also:

* Reduce the amount of callbacks.
* Move everything under `preinit` (but prepend to the callback). The API shouldn't be availbale earlier, and some UI is not available yet, neither is `editor.dom`.
* Hide the toolbar if the target is out of view.

See #32604.



git-svn-id: https://develop.svn.wordpress.org/trunk@32831 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ella Iseulde Van Dorpe 2015-06-18 11:09:56 +00:00
parent cfbff5b495
commit b1446f4221
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -443,23 +443,21 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
* 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,10 +585,6 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
toolbar.bottom = bottom;
function hide() {
toolbar.hide();
}
function reposition() {
var scrollX = window.pageXOffset || document.documentElement.scrollLeft,
scrollY = window.pageYOffset || document.documentElement.scrollTop,
@ -617,6 +611,10 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
className = '',
top, left;
if ( spaceTop >= editorHeight || spaceBottom >= editorHeight ) {
return this.hide();
}
if ( this.bottom ) {
if ( spaceBottom >= spaceNeeded ) {
className = ' mce-arrow-up';
@ -677,18 +675,6 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
}
} );
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,13 +721,29 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
}
} );
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() {}