Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-23 07:51:49 +01:00
Code Issues Projects Releases Wiki Activity

TinyMCE: show active inline toolbar after focus

Browse Source 
This makes sure that e.g. the image toolbar shows up again after closing the media library modal.

See #32604.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32789 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ella Iseulde Van Dorpe 2015-06-17 07:08:25 +00:00
parent c465640107
commit 8fba763f37
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,7 +446,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
( function() { ( function() {
var Factory = tinymce.ui.Factory, var Factory = tinymce.ui.Factory,
settings = editor.settings, settings = editor.settings,
currentToolbar, activeToolbar,
currentSelection, currentSelection,
wpAdminbar = document.getElementById( 'wpadminbar' ), wpAdminbar = document.getElementById( 'wpadminbar' ),
mceIframe, mceToolbar, mceStatusbar, wpStatusbar; mceIframe, mceToolbar, mceStatusbar, wpStatusbar;
@ -667,14 +667,9 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
} }
toolbar.on( 'show', function() { toolbar.on( 'show', function() {
currentToolbar = this;
this.reposition(); this.reposition();
} ); } );
toolbar.on( 'hide', function() {
currentToolbar = false;
} );
toolbar.on( 'keydown', function( event ) { toolbar.on( 'keydown', function( event ) {
if ( event.keyCode === 27 ) { if ( event.keyCode === 27 ) {
this.hide(); this.hide();
@ -703,8 +698,8 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
editor.shortcuts.add( 'alt+119', '', function() { editor.shortcuts.add( 'alt+119', '', function() {
var node; var node;
if ( currentToolbar ) { if ( activeToolbar ) {
node = currentToolbar.find( 'toolbar' )[0]; node = activeToolbar.find( 'toolbar' )[0];
node && node.focus( true ); node && node.focus( true );
} }
} ); } );
@ -722,8 +717,26 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
currentSelection = args.selection || args.element; currentSelection = args.selection || args.element;
currentToolbar && currentToolbar.hide(); if ( activeToolbar ) {
args.toolbar && args.toolbar.show(); activeToolbar.hide();
}
if ( args.toolbar ) {
activeToolbar = args.toolbar;
activeToolbar.show();
} else {
activeToolbar = false;
}
} );
editor.on( 'focus', function() {
if ( activeToolbar ) {
activeToolbar.show();
}
} );
editor.on( 'hide', function() {
activeToolbar = false;
} ); } );
editor.wp = editor.wp || {}; editor.wp = editor.wp || {};

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.3-alpha-32817'; $wp_version = '4.3-alpha-32818';
/** /**
* 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.