Skip to content

Commit 9bcf4b1

Browse files
committed
fix: remove type attribute from wp-emoji-release.min.js for HTML5 compliance
1 parent 6936c5b commit 9bcf4b1

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,9 @@
317317
var script = document.createElement( 'script' );
318318
script.src = src;
319319
script.defer = true;
320+
if ( settings.typeAttr ) {
321+
script.type = settings.typeAttr;
322+
}
320323
document.head.appendChild( script );
321324
}
322325

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
var first, s;
1717
s = document.createElement('script');
1818
s.src = _zxcvbnSettings.src;
19-
s.type = 'text/javascript';
19+
if ( _zxcvbnSettings.typeAttr ) {
20+
s.type = _zxcvbnSettings.typeAttr;
21+
}
2022
s.async = true;
2123
first = document.getElementsByTagName('script')[0];
2224
return first.parentNode.insertBefore(s, first);

src/wp-includes/formatting.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5888,6 +5888,8 @@ function print_emoji_detection_script() {
58885888
* @access private
58895889
*/
58905890
function _print_emoji_detection_script() {
5891+
$type_attr = current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"';
5892+
58915893
$settings = array(
58925894
/**
58935895
* Filters the URL where emoji png images are hosted.
@@ -5924,6 +5926,8 @@ function _print_emoji_detection_script() {
59245926
* @param string $extension The emoji extension for svg files. Default .svg.
59255927
*/
59265928
'svgExt' => apply_filters( 'emoji_svg_ext', '.svg' ),
5929+
5930+
'typeAttr' => $type_attr,
59275931
);
59285932

59295933
$version = 'ver=' . get_bloginfo( 'version' );

src/wp-includes/script-loader.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1190,6 +1190,7 @@ function wp_default_scripts( $scripts ) {
11901190
'_zxcvbnSettings',
11911191
array(
11921192
'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js',
1193+
'typeAttr' => current_theme_supports( 'html5', 'script' ) ? '' : ' type="text/javascript"',
11931194
)
11941195
);
11951196

0 commit comments

Comments
 (0)