Changeset 46164 for trunk/src/wp-includes/class.wp-scripts.php

Timestamp:

09/18/2019 02:49:30 PM (16 months ago)

Author:

SergeyBiryukov

Message:

Script Loader: Introduce HTML5 support for scripts and styles.

When a theme declares HTML5 support for script and styles via add_theme_support( 'html5', array( 'script', 'style' ) ), the type="text/javascript" and type="text/css" attributes are omitted.

These attributes are unnecessary in HTML5 and cause warnings in the W3C Markup Validation Service.

Props sasiddiqui, swissspidy, knutsp, SergeyBiryukov.
See #42804.

File:

• trunk/src/wp-includes/class.wp-scripts.php (modified) (8 diffs)

trunk/src/wp-includes/class.wp-scripts.php

@@ -124 +124 @@
 
     /**
+     * Holds a string which contains the type attribute for script tag.
+     *
+     * If the current theme does not declare HTML5 support for 'script',
+     * then it initializes as `type='text/javascript'`.
+     *
+     * @since 5.3.0
+     * @var string
+     */
+    private $type_attr = '';
+
+    /**
      * Constructor.
      *
@@ -131 +142 @@
         $this->init();
         add_action( 'init', array( $this, 'init' ), 0 );
+
+        if ( ! current_theme_supports( 'html5', 'script' ) ) {
+            $this->type_attr = " type='text/javascript'";
+        }
     }
 
@@ -206 +221 @@
         }
 
-        echo "<script type='text/javascript'>\n"; // CDATA and type='text/javascript' is not needed for HTML 5.
+        echo "<script{$this->type_attr}>\n"; // CDATA and type="text/javascript" is not needed for HTML 5.
         echo "/* <![CDATA[ */\n";
         echo "$output\n";
@@ -267 +282 @@
 
         if ( $before_handle ) {
-            $before_handle = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $before_handle );
+            $before_handle = sprintf( "<script%s>\n%s\n</script>\n", $this->type_attr, $before_handle );
         }
 
         if ( $after_handle ) {
-            $after_handle = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $after_handle );
+            $after_handle = sprintf( "<script%s>\n%s\n</script>\n", $this->type_attr, $after_handle );
         }
 
         if ( $before_handle || $after_handle ) {
-            $inline_script_tag = "{$cond_before}{$before_handle}{$after_handle}{$cond_after}";
+            $inline_script_tag = $cond_before . $before_handle . $after_handle . $cond_after;
         } else {
             $inline_script_tag = '';
@@ -335 +350 @@
         $translations = $this->print_translations( $handle, false );
         if ( $translations ) {
-            $translations = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $translations );
+            $translations = sprintf( "<script%s>\n%s\n</script>\n", $this->type_attr, $translations );
         }
 
@@ -353 +368 @@
         }
 
-        $tag = "{$translations}{$cond_before}{$before_handle}<script type='text/javascript' src='$src'></script>\n{$after_handle}{$cond_after}";
+        $tag  = $translations . $cond_before . $before_handle;
+        $tag .= sprintf( "<script%s src='%s'></script>\n", $this->type_attr, $src );
+        $tag .= $after_handle . $cond_after;
 
         /**
@@ -423 +440 @@
 
         if ( $echo ) {
-            printf( "<script type='text/javascript'>\n%s\n</script>\n", $output );
+            printf( "<script%s>\n%s\n</script>\n", $this->type_attr, $output );
         }
 
@@ -558 +575 @@
 
         if ( $echo ) {
-            printf( "<script type='text/javascript'>\n%s\n</script>\n", $output );
+            printf( "<script%s>\n%s\n</script>\n", $this->type_attr, $output );
         }