Changeset 50629

Timestamp:

04/01/2021 11:44:54 AM (3 years ago)

Author:

SergeyBiryukov

Message:

Editor: Consolidate enqueueing block editor assets in wp-includes/default-filters.php.

Follow-up to [44157], [46111], [48537], [50620].

See #52920.

Location:

trunk/src/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• script-loader.php (modified) (2 diffs)

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

@@ -535 +535 @@
 
 add_action( 'wp_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_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_assets', 'enqueue_block_styles_assets', 30 );
+add_action( 'enqueue_block_editor_assets', 'wp_enqueue_registered_block_scripts_and_styles' );
+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( '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' );
 add_filter( 'print_scripts_array', 'wp_prototype_before_jquery' );
 add_filter( 'customize_controls_print_styles', 'wp_resource_hints', 1 );
-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

@@ -2325 +2325 @@
 
 /**
+ * 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' );
+}
+
+/**
  * Enqueues the assets required for the format library within the block editor.
  *
@@ -2332 +2342 @@
     wp_enqueue_script( 'wp-format-library' );
     wp_enqueue_style( 'wp-format-library' );
-}
-
-/**
- * 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' );
 }