Changeset 44251

Timestamp:

12/17/2018 12:28:36 AM (6 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-admin/edit-form-blocks.php (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-admin/edit-form-blocks.php

@@ -306 +306 @@
     )
 );
+wp_tinymce_inline_scripts();
 wp_enqueue_editor();
 

trunk/src/wp-includes/script-loader.php

@@ -476 +476 @@
         'after'
     );
-
-    // TinyMCE init.
+}
+
+/**
+ * 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_plugins = array(
         'charmap',
@@ -588 +598 @@
     }';
 
-    $scripts->add_inline_script( 'wp-block-library', $script, 'before' );
+    $wp_scripts->add_inline_script( 'wp-block-library', $script, 'before' );
 }