enmi-conf.org: comparison wp/wp-includes/class.wp-scripts.php

equal deleted inserted replaced

-:3d4e9c994f10
+:a86126ab1dd4
 	 * @var array
 	 */
 	public $default_dirs;
 	/**
+	 * 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.
 	 *
 	 * @since 2.6.0
 	 */
 	public function __construct() {
 	 * Initialize the class.
 	 *
 	 * @since 3.4.0
 	 */
 	public function init() {
+		if (
+			function_exists( 'is_admin' ) && ! is_admin()
+		&&
+			function_exists( 'current_theme_supports' ) && ! current_theme_supports( 'html5', 'script' )
+		) {
+			$this->type_attr = " type='text/javascript'";
+		}
 		/**
 		 * Fires when the WP_Scripts instance is initialized.
 		 *
 		 * @since 2.6.0
 		 *
 	 * Prints the scripts passed to it or the print queue. Also prints all necessary dependencies.
 	 *
 	 * @since 2.1.0
 	 * @since 2.8.0 Added the `$group` parameter.
 	 *
-	 * @param mixed $handles Optional. Scripts to be printed. (void) prints queue, (string) prints
+	 * @param string|string[]|false $handles Optional. Scripts to be printed: queue (false),
-	 *                       that script, (array of strings) prints those scripts. Default false.
+	 *                                       single script (string), or multiple scripts (array of strings).
-	 * @param int   $group   Optional. If scripts were queued in groups prints this group number.
+	 *                                       Default false.
-	 *                       Default false.
+	 * @param int|false             $group   Optional. Group level: level (int), no groups (false).
-	 * @return array Scripts that have been printed.
+	 *                                       Default false.
+	 * @return string[] Handles of scripts that have been printed.
 	 */
 	public function print_scripts( $handles = false, $group = false ) {
 		return $this->do_items( $handles, $group );
 	}
 	 * @deprecated 3.3.0
 	 *
 	 * @see print_extra_script()
 	 *
 	 * @param string $handle The script's registered handle.
-	 * @param bool   $echo   Optional. Whether to echo the extra script instead of just returning it.
+	 * @param bool   $echo   Optional. Whether to echo the extra script
-	 *                       Default true.
+	 *                       instead of just returning it. Default true.
-	 * @return bool|string|void Void if no data exists, extra scripts if `$echo` is true, true otherwise.
+	 * @return bool|string|void Void if no data exists, extra scripts if `$echo` is true,
+	 *                          true otherwise.
 	 */
 	public function print_scripts_l10n( $handle, $echo = true ) {
 		_deprecated_function( __FUNCTION__, '3.3.0', 'WP_Scripts::print_extra_script()' );
 		return $this->print_extra_script( $handle, $echo );
 	}
 	 * Prints extra scripts of a registered script.
 	 *
 	 * @since 3.3.0
 	 *
 	 * @param string $handle The script's registered handle.
-	 * @param bool   $echo   Optional. Whether to echo the extra script instead of just returning it.
+	 * @param bool   $echo   Optional. Whether to echo the extra script
-	 *                       Default true.
+	 *                       instead of just returning it. Default true.
-	 * @return bool|string|void Void if no data exists, extra scripts if `$echo` is true, true otherwise.
+	 * @return bool|string|void Void if no data exists, extra scripts if `$echo` is true,
+	 *                          true otherwise.
 	 */
 	public function print_extra_script( $handle, $echo = true ) {
-		if ( ! $output = $this->get_data( $handle, 'data' ) ) {
+		$output = $this->get_data( $handle, 'data' );
+		if ( ! $output ) {
 			return;
 		}
 		if ( ! $echo ) {
 			return $output;
 		}
-		echo "<script type='text/javascript'>\n"; // CDATA and type='text/javascript' is not needed for HTML 5.
+		printf( "<script%s id='%s-js-extra'>\n", $this->type_attr, esc_attr( $handle ) );
-		echo "/* <![CDATA[ */\n";
+		// CDATA is not needed for HTML 5.
+		if ( $this->type_attr ) {
+			echo "/* <![CDATA[ */\n";
+		}
 		echo "$output\n";
-		echo "/* ]]> */\n";
+		if ( $this->type_attr ) {
+			echo "/* ]]> */\n";
+		}
 		echo "</script>\n";
 		return true;
 	}
 	 * @since 2.8.0 Added the `$group` parameter.
 	 *
 	 * @see WP_Dependencies::do_item()
 	 *
 	 * @param string    $handle The script's registered handle.
-	 * @param int|false $group  Optional. Group level: (int) level, (false) no groups. Default false.
+	 * @param int|false $group  Optional. Group level: level (int), no groups (false).
+	 *                          Default false.
 	 * @return bool True on success, false on failure.
 	 */
 	public function do_item( $handle, $group = false ) {
 		if ( ! parent::do_item( $handle ) ) {
 			return false;
 		if ( isset( $this->args[ $handle ] ) ) {
 			$ver = $ver ? $ver . '&amp;' . $this->args[ $handle ] : $this->args[ $handle ];
 		}
 		$src         = $obj->src;
-		$cond_before = $cond_after = '';
+		$cond_before = '';
+		$cond_after  = '';
 		$conditional = isset( $obj->extra['conditional'] ) ? $obj->extra['conditional'] : '';
 		if ( $conditional ) {
 			$cond_before = "<!--[if {$conditional}]>\n";
 			$cond_after  = "<![endif]-->\n";
 		$before_handle = $this->print_inline_script( $handle, 'before', false );
 		$after_handle  = $this->print_inline_script( $handle, 'after', false );
 		if ( $before_handle ) {
-			$before_handle = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $before_handle );
+			$before_handle = sprintf( "<script%s id='%s-js-before'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $before_handle );
 		}
 		if ( $after_handle ) {
-			$after_handle = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $after_handle );
+			$after_handle = sprintf( "<script%s id='%s-js-after'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $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 = '';
+		}
+		$translations = $this->print_translations( $handle, false );
+		if ( $translations ) {
+			$translations = sprintf( "<script%s id='%s-js-translations'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $translations );
 		}
 		if ( $this->do_concat ) {
 			/**
 			 * Filters the script loader source.
 			 * @param string $src    Script loader source path.
 			 * @param string $handle Script handle.
 			 */
 			$srce = apply_filters( 'script_loader_src', $src, $handle );
-			if ( $this->in_default_dir( $srce ) && ( $before_handle || $after_handle ) ) {
+			if ( $this->in_default_dir( $srce ) && ( $before_handle || $after_handle || $translations ) ) {
 				$this->do_concat = false;
 				// Have to print the so-far concatenated scripts right away to maintain the right order.
 				_print_scripts();
 				$this->reset();
 			}
 			return true;
 		}
-		$translations = $this->print_translations( $handle, false );
-		if ( $translations ) {
-			$translations = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $translations );
-		}
 		if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
 			$src = $this->base_url . $src;
 		}
 		if ( ! empty( $ver ) ) {
 		if ( ! $src ) {
 			return true;
 		}
-		$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' id='%s-js'></script>\n", $this->type_attr, $src, esc_attr( $handle ) );
+		$tag .= $after_handle . $cond_after;
 		/**
 		 * Filters the HTML script tag of an enqueued script.
 		 *
 		 * @since 4.1.0
 	/**
 	 * Adds extra code to a registered script.
 	 *
 	 * @since 4.5.0
 	 *
-	 * @param string $handle   Name of the script to add the inline script to. Must be lowercase.
+	 * @param string $handle   Name of the script to add the inline script to.
+	 *                         Must be lowercase.
 	 * @param string $data     String containing the javascript to be added.
-	 * @param string $position Optional. Whether to add the inline script before the handle
+	 * @param string $position Optional. Whether to add the inline script
-	 *                         or after. Default 'after'.
+	 *                         before the handle or after. Default 'after'.
 	 * @return bool True on success, false on failure.
 	 */
 	public function add_inline_script( $handle, $data, $position = 'after' ) {
 		if ( ! $data ) {
 			return false;
 	/**
 	 * Prints inline scripts registered for a specific handle.
 	 *
 	 * @since 4.5.0
 	 *
-	 * @param string $handle   Name of the script to add the inline script to. Must be lowercase.
+	 * @param string $handle   Name of the script to add the inline script to.
-	 * @param string $position Optional. Whether to add the inline script before the handle
+	 *                         Must be lowercase.
-	 *                         or after. Default 'after'.
+	 * @param string $position Optional. Whether to add the inline script
-	 * @param bool   $echo     Optional. Whether to echo the script instead of just returning it.
+	 *                         before the handle or after. Default 'after'.
-	 *                         Default true.
+	 * @param bool   $echo     Optional. Whether to echo the script
+	 *                         instead of just returning it. Default true.
 	 * @return string|false Script on success, false otherwise.
 	 */
 	public function print_inline_script( $handle, $position = 'after', $echo = true ) {
 		$output = $this->get_data( $handle, $position );
 		}
 		$output = trim( implode( "\n", $output ), "\n" );
 		if ( $echo ) {
-			printf( "<script type='text/javascript'>\n%s\n</script>\n", $output );
+			printf( "<script%s id='%s-js-%s'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), esc_attr( $position ), $output );
 		}
 		return $output;
 	}
 	 * @param string $object_name Name of the variable that will contain the data.
 	 * @param array  $l10n        Array of data to localize.
 	 * @return bool True on success, false on failure.
 	 */
 	public function localize( $handle, $object_name, $l10n ) {
-		if ( $handle === 'jquery' ) {
+		if ( 'jquery' === $handle ) {
 			$handle = 'jquery-core';
 		}
 		if ( is_array( $l10n ) && isset( $l10n['l10n_print_after'] ) ) { // back compat, preserve the code in 'l10n_print_after' if present.
 			$after = $l10n['l10n_print_after'];
 	 *
 	 * @see WP_Dependencies::set_group()
 	 *
 	 * @param string    $handle    Name of the item. Should be unique.
 	 * @param bool      $recursion Internal flag that calling function was called recursively.
-	 * @param int|false $group     Optional. Group level: (int) level, (false) no groups. Default false.
+	 * @param int|false $group     Optional. Group level: level (int), no groups (false).
-	 * @return bool Not already in the group or a lower group
+	 *                             Default false.
+	 * @return bool Not already in the group or a lower group.
 	 */
 	public function set_group( $handle, $recursion, $group = false ) {
-		if ( isset( $this->registered[ $handle ]->args ) && $this->registered[ $handle ]->args === 1 ) {
+		if ( isset( $this->registered[ $handle ]->args ) && 1 === $this->registered[ $handle ]->args ) {
 			$grp = 1;
 		} else {
 			$grp = (int) $this->get_data( $handle, 'group' );
 		}
 	/**
 	 * Prints translations set for a specific handle.
 	 *
 	 * @since 5.0.0
 	 *
-	 * @param string $handle Name of the script to add the inline script to. Must be lowercase.
+	 * @param string $handle Name of the script to add the inline script to.
-	 * @param bool   $echo   Optional. Whether to echo the script instead of just returning it.
+	 *                       Must be lowercase.
-	 *                       Default true.
+	 * @param bool   $echo   Optional. Whether to echo the script
+	 *                       instead of just returning it. Default true.
 	 * @return string|false Script on success, false otherwise.
 	 */
 	public function print_translations( $handle, $echo = true ) {
 		if ( ! isset( $this->registered[ $handle ] ) || empty( $this->registered[ $handle ]->textdomain ) ) {
 			return false;
 	wp.i18n.setLocaleData( localeData, domain );
 } )( "{$domain}", {$json_translations} );
 JS;
 		if ( $echo ) {
-			printf( "<script type='text/javascript'>\n%s\n</script>\n", $output );
+			printf( "<script%s id='%s-js-translations'>\n%s\n</script>\n", $this->type_attr, esc_attr( $handle ), $output );
 		}
 		return $output;
 	}
 	 *
 	 * @since 2.1.0
 	 *
 	 * @see WP_Dependencies::all_deps()
 	 *
-	 * @param mixed     $handles   Item handle and argument (string) or item handles and arguments (array of strings).
+	 * @param string|string[] $handles   Item handle (string) or item handles (array of strings).
-	 * @param bool      $recursion Internal flag that function is calling itself.
+	 * @param bool            $recursion Optional. Internal flag that function is calling itself.
-	 * @param int|false $group     Optional. Group level: (int) level, (false) no groups. Default false.
+	 *                                   Default false.
+	 * @param int|false       $group     Optional. Group level: level (int), no groups (false).
+	 *                                   Default false.
 	 * @return bool True on success, false on failure.
 	 */
 	public function all_deps( $handles, $recursion = false, $group = false ) {
 		$r = parent::all_deps( $handles, $recursion, $group );
 		if ( ! $recursion ) {
 	 *
 	 * @since 2.8.0
 	 *
 	 * @see WP_Dependencies::do_items()
 	 *
-	 * @return array Handles of items that have been processed.
+	 * @return string[] Handles of items that have been processed.
 	 */
 	public function do_head_items() {
 		$this->do_items( false, 0 );
 		return $this->done;
 	}
 	 *
 	 * @since 2.8.0
 	 *
 	 * @see WP_Dependencies::do_items()
 	 *
-	 * @return array Handles of items that have been processed.
+	 * @return string[] Handles of items that have been processed.
 	 */
 	public function do_footer_items() {
 		$this->do_items( false, 1 );
 		return $this->done;
 	}

changeset 16	a86126ab1dd4
parent 9	177826044cd9
child 18	be944660c56a