From 0df28171ed9c3c31ebc93add82b64df8f690f87c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Zi=C3=83=C2=B3=C3=85=E2=80=9Akowski?= Date: Wed, 31 Mar 2021 05:50:50 +0000 Subject: [PATCH] Editor: Enqueue assets for format library for the block editor Ensures that `wp-format-library` assets are always loaded for the block editor. Otherwise, they have to be loaded individually for every screen that needs it. It's similar to how `wp-block-directory` assets are handled. Props ellatrix. See #52920. git-svn-id: https://develop.svn.wordpress.org/trunk@50620 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/edit-form-blocks.php | 2 -- src/wp-includes/default-filters.php | 1 + src/wp-includes/script-loader.php | 10 ++++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php index 5ce8fba395..3a61483be0 100644 --- a/src/wp-admin/edit-form-blocks.php +++ b/src/wp-admin/edit-form-blocks.php @@ -39,7 +39,6 @@ add_filter( 'screen_options_show_screen', '__return_false' ); wp_enqueue_script( 'heartbeat' ); wp_enqueue_script( 'wp-edit-post' ); -wp_enqueue_script( 'wp-format-library' ); $rest_base = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name; @@ -398,7 +397,6 @@ wp_enqueue_editor(); * Styles */ wp_enqueue_style( 'wp-edit-post' ); -wp_enqueue_style( 'wp-format-library' ); /** * Fires after block assets have been enqueued for the editing interface. diff --git a/src/wp-includes/default-filters.php b/src/wp-includes/default-filters.php index 23bb302359..29a77af00d 100644 --- a/src/wp-includes/default-filters.php +++ b/src/wp-includes/default-filters.php @@ -538,6 +538,7 @@ add_action( 'admin_enqueue_scripts', 'wp_localize_jquery_ui_datepicker', 1000 ); add_action( 'wp_enqueue_scripts', 'wp_common_block_scripts_and_styles' ); add_action( 'admin_enqueue_scripts', 'wp_common_block_scripts_and_styles' ); add_action( 'enqueue_block_assets', 'wp_enqueue_registered_block_scripts_and_styles' ); +add_action( 'enqueue_block_editor_assets', 'wp_enqueue_editor_format_library_assets' ); add_action( 'enqueue_block_editor_assets', 'wp_enqueue_registered_block_scripts_and_styles' ); add_action( 'admin_print_scripts-index.php', 'wp_localize_community_events' ); add_filter( 'wp_print_scripts', 'wp_just_in_time_script_localization' ); diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index ad38dae7b6..62bbda090c 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -2323,6 +2323,16 @@ function enqueue_editor_block_styles_assets() { wp_enqueue_script( 'wp-block-styles' ); } +/** + * Enqueues the assets required for the format library within the block editor. + * + * @since 5.8.0 + */ +function wp_enqueue_editor_format_library_assets() { + wp_enqueue_script( 'wp-format-library' ); + wp_enqueue_style( 'wp-format-library' ); +} + /** * Enqueues the assets required for the block directory within the block editor. *