Ticket #51837: 51837.2.diff

src/js/_enqueues/lib/emoji-loader.js

@@ -154 +154 @@
                 var script = document.createElement( 'script' );
 
                 script.src = src;
-                script.defer = script.type = 'text/javascript';
+                script.defer = true;
+
+                if ( settings.typeAttr ) {
+                        script.type = settings.typeAttr;
+                }
+
                 document.getElementsByTagName( 'head' )[0].appendChild( script );
         }
 

src/js/_enqueues/lib/zxcvbn-async.js

@@ -16 +16 @@
     var first, s;
     s = document.createElement('script');
     s.src = _zxcvbnSettings.src;
-    s.type = 'text/javascript';
+    s.type = _zxcvbnSettings.typeAttr;
     s.async = true;
     first = document.getElementsByTagName('script')[0];
     return first.parentNode.insertBefore(s, first);

src/wp-includes/formatting.php

@@ -5664 +5664 @@
  * @access private
  */
 function _print_emoji_detection_script() {
+        $type_attr = current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"';
+
         $settings = array(
                 /**
                  * Filters the URL where emoji png images are hosted.
@@ -5672 +5674 @@
                  *
                  * @param string $url The emoji base URL for png images.
                  */
-                'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/13.0.1/72x72/' ),
+                'baseUrl'  => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/13.0.1/72x72/' ),
 
                 /**
                  * Filters the extension of the emoji png files.
@@ -5681 +5683 @@
                  *
                  * @param string $extension The emoji extension for png files. Default .png.
                  */
-                'ext'     => apply_filters( 'emoji_ext', '.png' ),
+                'ext'      => apply_filters( 'emoji_ext', '.png' ),
 
                 /**
                  * Filters the URL where emoji SVG images are hosted.
@@ -5690 +5692 @@
                  *
                  * @param string $url The emoji base URL for svg images.
                  */
-                'svgUrl'  => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/13.0.1/svg/' ),
+                'svgUrl'   => apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/13.0.1/svg/' ),
 
                 /**
                  * Filters the extension of the emoji SVG files.
@@ -5699 +5701 @@
                  *
                  * @param string $extension The emoji extension for svg files. Default .svg.
                  */
-                'svgExt'  => apply_filters( 'emoji_svg_ext', '.svg' ),
+                'svgExt'   => apply_filters( 'emoji_svg_ext', '.svg' ),
+
+                /**
+                 * Filters the type attribute of the emoji script tag.
+                 *
+                 * @since x.y.z
+                 *
+                 * @param string $type_attr The emoji script tag type attribute.
+                 */
+                'typeAttr' => apply_filters( 'emoji_type_attr', $type_attr ),
         );
 
         $version   = 'ver=' . get_bloginfo( 'version' );
-        $type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/javascript"';
 
         if ( SCRIPT_DEBUG ) {
                 $settings['source'] = array(

src/wp-includes/script-loader.php

@@ -1065 +1065 @@
                 'zxcvbn-async',
                 '_zxcvbnSettings',
                 array(
-                        'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js',
+                        'src'      => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js',
+                        'typeAttr' => current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"',
                 )
         );