From 15fa394a0157e1328e5c618aca93314140c5ef03 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 17 Dec 2018 19:33:09 +0000 Subject: [PATCH] Block Editor: Fix the WordPress packages and vendor script registration. The version is set properly and the scripts are automatically loaded in the footer. This patch also includes a revert for the reusable blocks enqueue script. Props pento, swissspidy, youknowriad. Merges [43942] into trunk. Fixes #45402. See #45396. git-svn-id: https://develop.svn.wordpress.org/trunk@44277 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/edit.php | 4 +--- src/wp-includes/script-loader.php | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php index a469bbd4b0..20fb7e466f 100644 --- a/src/wp-admin/edit.php +++ b/src/wp-admin/edit.php @@ -201,10 +201,8 @@ wp_enqueue_script( 'inline-edit-post' ); wp_enqueue_script( 'heartbeat' ); if ( 'wp_block' === $post_type ) { + wp_enqueue_script( 'wp-list-reusable-blocks' ); wp_enqueue_style( 'wp-list-reusable-blocks' ); - - // wp-list-reusable-blocks enhances the page's DOM and so needs to be loaded in the footer. - wp_enqueue_script( 'wp-list-reusable-blocks', '', array(), false, true ); } $title = $post_type_object->labels->name; diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 5ce5d45557..2501c53f9d 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -111,7 +111,7 @@ function wp_default_packages_vendor( &$scripts ) { $path = "/wp-includes/js/dist/vendor/$handle$dev_suffix.js"; $version = $vendor_scripts_versions[ $handle ]; - $scripts->add( $handle, $path, $dependencies, false, $version ); + $scripts->add( $handle, $path, $dependencies, $version, 1 ); } $scripts->add( 'wp-polyfill', null, array( 'wp-polyfill' ) ); @@ -466,7 +466,7 @@ function wp_default_packages_scripts( &$scripts ) { $path = "/wp-includes/js/dist/$package$suffix.js"; $version = $packages_versions[ $package ]; - $scripts->add( $handle, $path, $dependencies, false, $version ); + $scripts->add( $handle, $path, $dependencies, $version, 1 ); if ( isset( $package_translations[ $package ] ) ) { $scripts->set_translations( $handle, $package_translations[ $package ] );