From e03dee4e875a1575c8d718d0aaa06cad70b49278 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 17 Dec 2018 00:28:36 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@44251 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/edit-form-blocks.php | 1 + src/wp-includes/script-loader.php | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php index 2ee0ba988a..0f4ccee94b 100644 --- a/src/wp-admin/edit-form-blocks.php +++ b/src/wp-admin/edit-form-blocks.php @@ -305,6 +305,7 @@ wp_enqueue_media( 'post' => $post->ID, ) ); +wp_tinymce_inline_scripts(); wp_enqueue_editor(); /** diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 6a3cf7d5e5..245d12d687 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -475,8 +475,18 @@ function wp_default_packages_inline_scripts( &$scripts ) { 'window.wp.oldEditor = window.wp.editor;', '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( 'charmap', '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' ); } /**