WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TinyMCE: ensure the inline toolbar is shown and properly positioned when there are several wpview blocks in the editor and the user selects one after the other. 

Props gitlost.
Fixes #38849.
Built from https://develop.svn.wordpress.org/trunk@39910


git-svn-id: http://core.svn.wordpress.org/trunk@39847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2017-01-16 00:22:43 +00:00
parent 1ba4484186
commit 82a8065f70
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -966,11 +966,12 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
} }
if ( args.toolbar ) { if ( args.toolbar ) {
if ( activeToolbar !== args.toolbar ) {
activeToolbar = args.toolbar; activeToolbar = args.toolbar;
activeToolbar.show();
} else { if ( activeToolbar.visible() ) {
activeToolbar.reposition(); activeToolbar.reposition();
} else {
activeToolbar.show();
} }
} else { } else {
activeToolbar = false; activeToolbar = false;

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.8-alpha-39909'; $wp_version = '4.8-alpha-39910';
/** /**
* 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.