Changeset 56526 for trunk

Timestamp:

09/06/2023 09:21:17 PM (3 years ago)

Author:

flixos90

Message:

Bundled Theme: Update default themes to use new script function signature.

In WordPress 6.3, the last parameter of wp_register_script() and wp_enqueue_script() was changed to an array rather than a boolean. While a boolean is still supported for backward compatibility, it makes sense to update the codebase to use the new signature.

The updates are fully backward compatible:

• In places where true was provided, array( 'in_footer' => true ) will still be interpreted as a boolean true in WordPress versions prior to 6.3.
• In places where false was provided, the parameter is omitted which will work correctly throughout all WordPress versions given that is and has been the default value anyway.

Props mrinal013, huzaifaalmesbah, niravsherasiya7707, joemcgill.
Fixes #59302.
See #58634.

Location:

trunk/src/wp-content/themes

Files:

• twentyeleven/inc/theme-options.php (modified) (1 diff)
• twentyfifteen/functions.php (modified) (2 diffs)
• twentyfifteen/inc/customizer.php (modified) (2 diffs)
• twentyfourteen/functions.php (modified) (2 diffs)
• twentyfourteen/inc/customizer.php (modified) (1 diff)
• twentyfourteen/inc/featured-content.php (modified) (1 diff)
• twentynineteen/functions.php (modified) (1 diff)
• twentynineteen/inc/customizer.php (modified) (2 diffs)
• twentyseventeen/functions.php (modified) (3 diffs)
• twentyseventeen/inc/customizer.php (modified) (2 diffs)
• twentysixteen/functions.php (modified) (2 diffs)
• twentysixteen/inc/customizer.php (modified) (2 diffs)
• twentythirteen/functions.php (modified) (2 diffs)
• twentytwelve/functions.php (modified) (2 diffs)
• twentytwenty/functions.php (modified) (4 diffs)
• twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php (modified) (3 diffs)
• twentytwentyone/functions.php (modified) (8 diffs)

trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php

@@ -674 +674 @@
  */
 function twentyeleven_customize_preview_js() {
-        wp_enqueue_script( 'twentyeleven-customizer', get_template_directory_uri() . '/inc/theme-customizer.js', array( 'customize-preview' ), '20150401', true );
+        wp_enqueue_script( 'twentyeleven-customizer', get_template_directory_uri() . '/inc/theme-customizer.js', array( 'customize-preview' ), '20150401', array( 'in_footer' => true ) );
 }
 add_action( 'customize_preview_init', 'twentyeleven_customize_preview_js' );

trunk/src/wp-content/themes/twentyfifteen/functions.php

@@ -445 +445 @@
 
         // Skip-link fix is no longer enqueued by default.
-        wp_register_script( 'twentyfifteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20230526', true );
+        wp_register_script( 'twentyfifteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20230526', array( 'in_footer' => true ) );
 
         if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
@@ -455 +455 @@
         }
 
-        wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20221101', true );
+        wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20221101', array( 'in_footer' => true ) );
         wp_localize_script(
                 'twentyfifteen-script',

trunk/src/wp-content/themes/twentyfifteen/inc/customizer.php

@@ -360 +360 @@
  */
 function twentyfifteen_customize_control_js() {
-        wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls', 'iris', 'underscore', 'wp-util' ), '20141216', true );
+        wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls', 'iris', 'underscore', 'wp-util' ), '20141216', array( 'in_footer' => true ) );
         wp_localize_script( 'color-scheme-control', 'colorScheme', twentyfifteen_get_color_schemes() );
 }
@@ -371 +371 @@
  */
 function twentyfifteen_customize_preview_js() {
-        wp_enqueue_script( 'twentyfifteen-customize-preview', get_template_directory_uri() . '/js/customize-preview.js', array( 'customize-preview' ), '20141216', true );
+        wp_enqueue_script( 'twentyfifteen-customize-preview', get_template_directory_uri() . '/js/customize-preview.js', array( 'customize-preview' ), '20141216', array( 'in_footer' => true ) );
 }
 add_action( 'customize_preview_init', 'twentyfifteen_customize_preview_js' );

trunk/src/wp-content/themes/twentyfourteen/functions.php

@@ -368 +368 @@
 
         if ( is_front_page() && 'slider' === get_theme_mod( 'featured_content_layout' ) ) {
-                wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20150120', true );
+                wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20150120', array( 'in_footer' => true ) );
                 wp_localize_script(
                         'twentyfourteen-slider',
@@ -379 +379 @@
         }
 
-        wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20230526', true );
+        wp_enqueue_script( 'twentyfourteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20230526', array( 'in_footer' => true ) );
 }
 add_action( 'wp_enqueue_scripts', 'twentyfourteen_scripts' );

trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php

@@ -143 +143 @@
  */
 function twentyfourteen_customize_preview_js() {
-        wp_enqueue_script( 'twentyfourteen_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20141015', true );
+        wp_enqueue_script( 'twentyfourteen_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20141015', array( 'in_footer' => true ) );
 }
 add_action( 'customize_preview_init', 'twentyfourteen_customize_preview_js' );

trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php

@@ -435 +435 @@
          */
         public static function enqueue_scripts() {
-                wp_enqueue_script( 'featured-content-suggest', get_template_directory_uri() . '/js/featured-content-admin.js', array( 'jquery', 'suggest' ), '20211130', true );
+                wp_enqueue_script( 'featured-content-suggest', get_template_directory_uri() . '/js/featured-content-admin.js', array( 'jquery', 'suggest' ), '20211130', array( 'in_footer' => true ) );
         }
 

trunk/src/wp-content/themes/twentynineteen/functions.php

@@ -260 +260 @@
 
         if ( has_nav_menu( 'menu-1' ) ) {
-                wp_enqueue_script( 'twentynineteen-priority-menu', get_theme_file_uri( '/js/priority-menu.js' ), array(), '20200129', true );
-                wp_enqueue_script( 'twentynineteen-touch-navigation', get_theme_file_uri( '/js/touch-keyboard-navigation.js' ), array(), '20230621', true );
+                wp_enqueue_script( 'twentynineteen-priority-menu', get_theme_file_uri( '/js/priority-menu.js' ), array(), '20200129', array( 'in_footer' => true ) );
+                wp_enqueue_script( 'twentynineteen-touch-navigation', get_theme_file_uri( '/js/touch-keyboard-navigation.js' ), array(), '20230621', array( 'in_footer' => true ) );
         }
 

trunk/src/wp-content/themes/twentynineteen/inc/customizer.php

@@ -126 +126 @@
  */
 function twentynineteen_customize_preview_js() {
-        wp_enqueue_script( 'twentynineteen-customize-preview', get_theme_file_uri( '/js/customize-preview.js' ), array( 'customize-preview' ), '20181214', true );
+        wp_enqueue_script( 'twentynineteen-customize-preview', get_theme_file_uri( '/js/customize-preview.js' ), array( 'customize-preview' ), '20181214', array( 'in_footer' => true ) );
 }
 add_action( 'customize_preview_init', 'twentynineteen_customize_preview_js' );
@@ -134 +134 @@
  */
 function twentynineteen_panels_js() {
-        wp_enqueue_script( 'twentynineteen-customize-controls', get_theme_file_uri( '/js/customize-controls.js' ), array(), '20181214', true );
+        wp_enqueue_script( 'twentynineteen-customize-controls', get_theme_file_uri( '/js/customize-controls.js' ), array(), '20181214', array( 'in_footer' => true ) );
 }
 add_action( 'customize_controls_enqueue_scripts', 'twentynineteen_panels_js' );

trunk/src/wp-content/themes/twentyseventeen/functions.php

@@ -478 +478 @@
 
         // Skip-link fix is no longer enqueued by default.
-        wp_register_script( 'twentyseventeen-skip-link-focus-fix', get_theme_file_uri( '/assets/js/skip-link-focus-fix.js' ), array(), '20161114', true );
-
-        wp_enqueue_script( 'twentyseventeen-global', get_theme_file_uri( '/assets/js/global.js' ), array( 'jquery' ), '20211130', true );
+        wp_register_script( 'twentyseventeen-skip-link-focus-fix', get_theme_file_uri( '/assets/js/skip-link-focus-fix.js' ), array(), '20161114', array( 'in_footer' => true ) );
+
+        wp_enqueue_script( 'twentyseventeen-global', get_theme_file_uri( '/assets/js/global.js' ), array( 'jquery' ), '20211130', array( 'in_footer' => true ) );
 
         $twentyseventeen_l10n = array(
@@ -487 +487 @@
 
         if ( has_nav_menu( 'top' ) ) {
-                wp_enqueue_script( 'twentyseventeen-navigation', get_theme_file_uri( '/assets/js/navigation.js' ), array( 'jquery' ), '20210122', true );
+                wp_enqueue_script( 'twentyseventeen-navigation', get_theme_file_uri( '/assets/js/navigation.js' ), array( 'jquery' ), '20210122', array( 'in_footer' => true ) );
                 $twentyseventeen_l10n['expand']   = __( 'Expand child menu', 'twentyseventeen' );
                 $twentyseventeen_l10n['collapse'] = __( 'Collapse child menu', 'twentyseventeen' );
@@ -500 +500 @@
         wp_localize_script( 'twentyseventeen-global', 'twentyseventeenScreenReaderText', $twentyseventeen_l10n );
 
-        wp_enqueue_script( 'jquery-scrollto', get_theme_file_uri( '/assets/js/jquery.scrollTo.js' ), array( 'jquery' ), '2.1.3', true );
+        wp_enqueue_script( 'jquery-scrollto', get_theme_file_uri( '/assets/js/jquery.scrollTo.js' ), array( 'jquery' ), '2.1.3', array( 'in_footer' => true ) );
 
         if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {

trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php

@@ -246 +246 @@
  */
 function twentyseventeen_customize_preview_js() {
-        wp_enqueue_script( 'twentyseventeen-customize-preview', get_theme_file_uri( '/assets/js/customize-preview.js' ), array( 'customize-preview' ), '20161002', true );
+        wp_enqueue_script( 'twentyseventeen-customize-preview', get_theme_file_uri( '/assets/js/customize-preview.js' ), array( 'customize-preview' ), '20161002', array( 'in_footer' => true ) );
 }
 add_action( 'customize_preview_init', 'twentyseventeen_customize_preview_js' );
@@ -254 +254 @@
  */
 function twentyseventeen_panels_js() {
-        wp_enqueue_script( 'twentyseventeen-customize-controls', get_theme_file_uri( '/assets/js/customize-controls.js' ), array(), '20161020', true );
+        wp_enqueue_script( 'twentyseventeen-customize-controls', get_theme_file_uri( '/assets/js/customize-controls.js' ), array(), '20161020', array( 'in_footer' => true ) );
 }
 add_action( 'customize_controls_enqueue_scripts', 'twentyseventeen_panels_js' );

trunk/src/wp-content/themes/twentysixteen/functions.php

@@ -414 +414 @@
 
         // Skip-link fix is no longer enqueued by default.
-        wp_register_script( 'twentysixteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20230526', true );
+        wp_register_script( 'twentysixteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20230526', array( 'in_footer' => true ) );
 
         if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
@@ -424 +424 @@
         }
 
-        wp_enqueue_script( 'twentysixteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20230629', true );
+        wp_enqueue_script( 'twentysixteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20230629', array( 'in_footer' => true ) );
 
         wp_localize_script(

trunk/src/wp-content/themes/twentysixteen/inc/customizer.php

@@ -487 +487 @@
  */
 function twentysixteen_customize_control_js() {
-        wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls', 'iris', 'underscore', 'wp-util' ), '20170530', true );
+        wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls', 'iris', 'underscore', 'wp-util' ), '20170530', array( 'in_footer' => true ) );
         wp_localize_script( 'color-scheme-control', 'colorScheme', twentysixteen_get_color_schemes() );
 }
@@ -498 +498 @@
  */
 function twentysixteen_customize_preview_js() {
-        wp_enqueue_script( 'twentysixteen-customize-preview', get_template_directory_uri() . '/js/customize-preview.js', array( 'customize-preview' ), '20170530', true );
+        wp_enqueue_script( 'twentysixteen-customize-preview', get_template_directory_uri() . '/js/customize-preview.js', array( 'customize-preview' ), '20170530', array( 'in_footer' => true ) );
 }
 add_action( 'customize_preview_init', 'twentysixteen_customize_preview_js' );

trunk/src/wp-content/themes/twentythirteen/functions.php

@@ -322 +322 @@
 
         // Loads JavaScript file with functionality specific to Twenty Thirteen.
-        wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20230526', true );
+        wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20230526', array( 'in_footer' => true ) );
 
         // Add Source Sans Pro and Bitter fonts, used in the main stylesheet.
@@ -844 +844 @@
  */
 function twentythirteen_customize_preview_js() {
-        wp_enqueue_script( 'twentythirteen-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20200516', true );
+        wp_enqueue_script( 'twentythirteen-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20200516', array( 'in_footer' => true ) );
 }
 add_action( 'customize_preview_init', 'twentythirteen_customize_preview_js' );

trunk/src/wp-content/themes/twentytwelve/functions.php

@@ -189 +189 @@
 
         // Adds JavaScript for handling the navigation menu hide-and-show behavior.
-        wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20141205', true );
+        wp_enqueue_script( 'twentytwelve-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'jquery' ), '20141205', array( 'in_footer' => true ) );
 
         $font_url = twentytwelve_get_font_url();
@@ -693 +693 @@
  */
 function twentytwelve_customize_preview_js() {
-        wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20200516', true );
+        wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20200516', array( 'in_footer' => true ) );
 }
 add_action( 'customize_preview_init', 'twentytwelve_customize_preview_js' );

trunk/src/wp-content/themes/twentytwenty/functions.php

@@ -214 +214 @@
         }
 
-        wp_enqueue_script( 'twentytwenty-js', get_template_directory_uri() . '/assets/js/index.js', array(), $theme_version, false );
+        wp_enqueue_script( 'twentytwenty-js', get_template_directory_uri() . '/assets/js/index.js', array(), $theme_version );
         wp_script_add_data( 'twentytwenty-js', 'async', true );
 
@@ -432 +432 @@
 
         // Enqueue the editor script.
-        wp_enqueue_script( 'twentytwenty-block-editor-script', get_theme_file_uri( '/assets/js/editor-script-block.js' ), array( 'wp-blocks', 'wp-dom' ), wp_get_theme()->get( 'Version' ), true );
+        wp_enqueue_script( 'twentytwenty-block-editor-script', get_theme_file_uri( '/assets/js/editor-script-block.js' ), array( 'wp-blocks', 'wp-dom' ), wp_get_theme()->get( 'Version' ), array( 'in_footer' => true ) );
 }
 
@@ -626 +626 @@
 
         // Add main customizer js file.
-        wp_enqueue_script( 'twentytwenty-customize', get_template_directory_uri() . '/assets/js/customize.js', array( 'jquery' ), $theme_version, false );
+        wp_enqueue_script( 'twentytwenty-customize', get_template_directory_uri() . '/assets/js/customize.js', array( 'jquery' ), $theme_version );
 
         // Add script for color calculations.
-        wp_enqueue_script( 'twentytwenty-color-calculations', get_template_directory_uri() . '/assets/js/color-calculations.js', array( 'wp-color-picker' ), $theme_version, false );
+        wp_enqueue_script( 'twentytwenty-color-calculations', get_template_directory_uri() . '/assets/js/color-calculations.js', array( 'wp-color-picker' ), $theme_version );
 
         // Add script for controls.
-        wp_enqueue_script( 'twentytwenty-customize-controls', get_template_directory_uri() . '/assets/js/customize-controls.js', array( 'twentytwenty-color-calculations', 'customize-controls', 'underscore', 'jquery' ), $theme_version, false );
+        wp_enqueue_script( 'twentytwenty-customize-controls', get_template_directory_uri() . '/assets/js/customize-controls.js', array( 'twentytwenty-color-calculations', 'customize-controls', 'underscore', 'jquery' ), $theme_version );
         wp_localize_script( 'twentytwenty-customize-controls', 'twentyTwentyBgColors', twentytwenty_get_customizer_color_vars() );
 }
@@ -648 +648 @@
         $theme_version = wp_get_theme()->get( 'Version' );
 
-        wp_enqueue_script( 'twentytwenty-customize-preview', get_theme_file_uri( '/assets/js/customize-preview.js' ), array( 'customize-preview', 'customize-selective-refresh', 'jquery' ), $theme_version, true );
+        wp_enqueue_script( 'twentytwenty-customize-preview', get_theme_file_uri( '/assets/js/customize-preview.js' ), array( 'customize-preview', 'customize-selective-refresh', 'jquery' ), $theme_version, array( 'in_footer' => true ) );
         wp_localize_script( 'twentytwenty-customize-preview', 'twentyTwentyBgColors', twentytwenty_get_customizer_color_vars() );
         wp_localize_script( 'twentytwenty-customize-preview', 'twentyTwentyPreviewEls', twentytwenty_get_elements_array() );

trunk/src/wp-content/themes/twentytwentyone/classes/class-twenty-twenty-one-dark-mode.php

@@ -70 +70 @@
                         array(),
                         '1.0.0',
-                        true
+                        array( 'in_footer' => true )
                 );
 
@@ -78 +78 @@
                         array( 'twentytwentyone-dark-mode-support-toggle' ),
                         '1.0.0',
-                        true
+                        array( 'in_footer' => true )
                 );
         }
@@ -116 +116 @@
                         array( 'customize-base', 'customize-controls', 'underscore', 'jquery', 'twentytwentyone-customize-helpers' ),
                         '1.0.0',
-                        true
+                        array( 'in_footer' => true )
                 );
         }

trunk/src/wp-content/themes/twentytwentyone/functions.php

@@ -422 +422 @@
                 array(),
                 wp_get_theme()->get( 'Version' ),
-                true
+                array( 'in_footer' => true )
         );
 
@@ -431 +431 @@
                 array(),
                 wp_get_theme()->get( 'Version' ),
-                true
+                array( 'in_footer' => true )
         );
         wp_add_inline_script(
@@ -450 +450 @@
                         array( 'twenty-twenty-one-ie11-polyfills' ),
                         wp_get_theme()->get( 'Version' ),
-                        true
+                        array( 'in_footer' => true )
                 );
         }
@@ -460 +460 @@
                 array( 'twenty-twenty-one-ie11-polyfills' ),
                 wp_get_theme()->get( 'Version' ),
-                true
+                array( 'in_footer' => true )
         );
 }
@@ -474 +474 @@
 function twentytwentyone_block_editor_script() {
 
-        wp_enqueue_script( 'twentytwentyone-editor', get_theme_file_uri( '/assets/js/editor.js' ), array( 'wp-blocks', 'wp-dom' ), wp_get_theme()->get( 'Version' ), true );
+        wp_enqueue_script( 'twentytwentyone-editor', get_theme_file_uri( '/assets/js/editor.js' ), array( 'wp-blocks', 'wp-dom' ), wp_get_theme()->get( 'Version' ), array( 'in_footer' => true ) );
 }
 
@@ -566 +566 @@
                 array(),
                 wp_get_theme()->get( 'Version' ),
-                true
+                array( 'in_footer' => true )
         );
 
@@ -574 +574 @@
                 array( 'customize-preview', 'customize-selective-refresh', 'jquery', 'twentytwentyone-customize-helpers' ),
                 wp_get_theme()->get( 'Version' ),
-                true
+                array( 'in_footer' => true )
         );
 }
@@ -593 +593 @@
                 array(),
                 wp_get_theme()->get( 'Version' ),
-                true
+                array( 'in_footer' => true )
         );
 }