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

TinyMCE: prevent undefined error in `toolbar.hide()`. 

See #32604.
Built from https://develop.svn.wordpress.org/trunk@32968


git-svn-id: http://core.svn.wordpress.org/trunk@32939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-06-27 02:24:25 +00:00
parent e311b53cfc
commit 81d0434421
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -793,7 +793,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
clearTimeout( timeout ); clearTimeout( timeout );
timeout = setTimeout( function() { timeout = setTimeout( function() {
activeToolbar.show(); activeToolbar && activeToolbar.show && activeToolbar.show();
}, 250 ); }, 250 );
} }
} }

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-32967'; $wp_version = '4.3-alpha-32968';
/** /**
* 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.