Block Editor: Load TinyMCE inline scripts later.

Previously, the TinyMCE inline scripts were added on the `init` action in the block editor. In the classic editor, however, these scripts are loaded when the TinyMCE window is printed, and some plugins rely on them being loaded later, so they can attach to the appropriate filters.

Props pento.
Merges [43901] to trunk.
Fixes #45338.
Built from https://develop.svn.wordpress.org/trunk@44251


git-svn-id: http://core.svn.wordpress.org/trunk@44081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-12-17 03:27:12 +00:00
parent 940a4be804
commit dbc692fb84
3 changed files with 14 additions and 3 deletions

View File

@ -305,6 +305,7 @@ wp_enqueue_media(
'post' => $post->ID, 'post' => $post->ID,
) )
); );
wp_tinymce_inline_scripts();
wp_enqueue_editor(); wp_enqueue_editor();
/** /**

View File

@ -475,8 +475,18 @@ function wp_default_packages_inline_scripts( &$scripts ) {
'window.wp.oldEditor = window.wp.editor;', 'window.wp.oldEditor = window.wp.editor;',
'after' 'after'
); );
}
/**
* Adds inline scripts required for the TinyMCE in the block editor.
*
* @since 5.0.0
*
* @global WP_Scripts $wp_scripts
*/
function wp_tinymce_inline_scripts() {
global $wp_scripts;
// TinyMCE init.
$tinymce_plugins = array( $tinymce_plugins = array(
'charmap', 'charmap',
'colorpicker', 'colorpicker',
@ -587,7 +597,7 @@ function wp_default_packages_inline_scripts( &$scripts ) {
} }
}'; }';
$scripts->add_inline_script( 'wp-block-library', $script, 'before' ); $wp_scripts->add_inline_script( 'wp-block-library', $script, 'before' );
} }
/** /**

View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.1-alpha-44250'; $wp_version = '5.1-alpha-44251';
/** /**
* 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.