From 1b281e4be2e64d418182a794d68bb40e15ef0d99 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Tue, 22 Dec 2020 16:17:27 +0000 Subject: [PATCH] Twenty Twenty-One: Only load IE specific polyfills when actually using Internet Exploreer. The `twenty-twenty-one-ie11-polyfills` script now has a `null` source, and the new `twenty-twenty-one-ie11-polyfills-asset` (which points to the actual `polyfills.js` source) will be loaded only if IE is detected by through the use of `wp_get_script_polyfill()`. Because the original script name remains the same, this change is backwards compatible with any code registering `twenty-twenty-one-id11-polyfills` as a script dependency. Props poena, ismail.elkorchi, peterwilsoncc. Merges [49865] to the 5.6 branch. Fixes #52098. git-svn-id: https://develop.svn.wordpress.org/branches/5.6@49868 602fd350-edb4-49c9-b593-d223f7449a82 --- .../themes/twentytwentyone/functions.php | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/src/wp-content/themes/twentytwentyone/functions.php b/src/wp-content/themes/twentytwentyone/functions.php index 652fc50db1..1139c3b659 100644 --- a/src/wp-content/themes/twentytwentyone/functions.php +++ b/src/wp-content/themes/twentytwentyone/functions.php @@ -396,7 +396,7 @@ add_action( 'after_setup_theme', 'twenty_twenty_one_content_width', 0 ); function twenty_twenty_one_scripts() { // Note, the is_IE global variable is defined by WordPress and is used // to detect if the current browser is internet explorer. - global $is_IE; + global $is_IE, $wp_scripts; if ( $is_IE ) { // If IE 11 or below, use a flattened stylesheet with static values replacing CSS Variables. wp_enqueue_style( 'twenty-twenty-one-style', get_template_directory_uri() . '/assets/css/ie.css', array(), wp_get_theme()->get( 'Version' ) ); @@ -416,14 +416,33 @@ function twenty_twenty_one_scripts() { wp_enqueue_script( 'comment-reply' ); } + // Register the IE11 polyfill file. wp_register_script( - 'twenty-twenty-one-ie11-polyfills', + 'twenty-twenty-one-ie11-polyfills-asset', get_template_directory_uri() . '/assets/js/polyfills.js', array(), wp_get_theme()->get( 'Version' ), true ); + // Register the IE11 polyfill loader. + wp_register_script( + 'twenty-twenty-one-ie11-polyfills', + null, + array(), + wp_get_theme()->get( 'Version' ), + true + ); + wp_add_inline_script( + 'twenty-twenty-one-ie11-polyfills', + wp_get_script_polyfill( + $wp_scripts, + array( + 'Element.prototype.matches && Element.prototype.closest && window.NodeList && NodeList.prototype.forEach' => 'twenty-twenty-one-ie11-polyfills-asset', + ) + ) + ); + // Main navigation scripts. if ( has_nav_menu( 'primary' ) ) { wp_enqueue_script(