Changeset 48537

Timestamp:

07/21/2020 03:36:17 PM (4 years ago)

Author:

desrosj

Message:

Editor: Ensure the required assets for the block directory are enqueued.

This fixes an issue where the block directory appears unstyled due to the stylesheets not being enqueued.

Props ryelle, timothyblynjacobs, earnjam.
Fixes #50661.

Location:

trunk/src

Files:

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

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

@@ -366 +366 @@
 wp_tinymce_inline_scripts();
 wp_enqueue_editor();
-wp_enqueue_script( 'wp-block-directory' );
+
 
 /**
@@ -373 +373 @@
 wp_enqueue_style( 'wp-edit-post' );
 wp_enqueue_style( 'wp-format-library' );
-wp_enqueue_style( 'wp-block-directory' );
 
 /**

trunk/src/wp-includes/default-filters.php

@@ -517 +517 @@
 add_action( 'enqueue_block_assets', 'enqueue_block_styles_assets', 30 );
 add_action( 'enqueue_block_editor_assets', 'enqueue_editor_block_styles_assets' );
+add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_block_directory_assets' );
 
 add_action( 'wp_default_styles', 'wp_default_styles' );

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

@@ -1464 +1464 @@
         ),
         'block-library'        => array(),
+        'block-directory'      => array(),
         'components'           => array(),
         'edit-post'            => array(
@@ -1528 +1529 @@
         'wp-block-editor',
         'wp-block-library',
+        'wp-block-directory',
         'wp-components',
         'wp-edit-post',
@@ -2270 +2272 @@
     wp_enqueue_script( 'wp-block-styles' );
 }
+
+/**
+ * Enqueues the assets required for the block directory within the block editor.
+ *
+ * @since 5.5.0
+ */
+function wp_enqueue_editor_block_directory_assets() {
+    wp_enqueue_script( 'wp-block-directory' );
+    wp_enqueue_style( 'wp-block-directory' );
+}