X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/4f9d63e13cd8c6e275797c75b401b074b82937bc..a7cd4c052013b423c6301153f68c7fdbaa2a447b:/wp-includes/class.wp-scripts.php

diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index 45d2e54c..fbb8b220 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -17,68 +17,73 @@
  * @since r16
  */
 class WP_Scripts extends WP_Dependencies {
-	var $base_url; // Full URL with trailing slash
-	var $content_url;
-	var $default_version;
-	var $in_footer = array();
-	var $concat = '';
-	var $concat_version = '';
-	var $do_concat = false;
-	var $print_html = '';
-	var $print_code = '';
-	var $ext_handles = '';
-	var $ext_version = '';
-	var $default_dirs;
-
-	function __construct() {
+	public $base_url; // Full URL with trailing slash
+	public $content_url;
+	public $default_version;
+	public $in_footer = array();
+	public $concat = '';
+	public $concat_version = '';
+	public $do_concat = false;
+	public $print_html = '';
+	public $print_code = '';
+	public $ext_handles = '';
+	public $ext_version = '';
+	public $default_dirs;
+
+	public function __construct() {
+		$this->init();
+		add_action( 'init', array( $this, 'init' ), 0 );
+	}
+
+	public function init() {
+		/**
+		 * Fires when the WP_Scripts instance is initialized.
+		 *
+		 * @since 2.6.0
+		 *
+		 * @param WP_Scripts &$this WP_Scripts instance, passed by reference.
+		 */
 		do_action_ref_array( 'wp_default_scripts', array(&$this) );
 	}
 
 	/**
-	 * Prints scripts
+	 * Prints scripts.
 	 *
-	 * Prints the scripts passed to it or the print queue.  Also prints all necessary dependencies.
+	 * Prints the scripts passed to it or the print queue. Also prints all necessary dependencies.
 	 *
-	 * @param mixed handles (optional) Scripts to be printed.  (void) prints queue, (string) prints that script, (array of strings) prints those scripts.
-	 * @param int group (optional) If scripts were queued in groups prints this group number.
-	 * @return array Scripts that have been printed
+	 * @param mixed $handles Optional. Scripts to be printed. (void) prints queue, (string) prints
+	 *                       that script, (array of strings) prints those scripts. Default false.
+	 * @param int   $group   Optional. If scripts were queued in groups prints this group number.
+	 *                       Default false.
+	 * @return array Scripts that have been printed.
 	 */
-	function print_scripts( $handles = false, $group = false ) {
+	public function print_scripts( $handles = false, $group = false ) {
 		return $this->do_items( $handles, $group );
 	}
 
-	function print_scripts_l10n( $handle, $echo = true ) {
-		if ( empty($this->registered[$handle]->extra['l10n']) || empty($this->registered[$handle]->extra['l10n'][0]) || !is_array($this->registered[$handle]->extra['l10n'][1]) )
-			return false;
+	// Deprecated since 3.3, see print_extra_script()
+	public function print_scripts_l10n( $handle, $echo = true ) {
+		_deprecated_function( __FUNCTION__, '3.3', 'print_extra_script()' );
+		return $this->print_extra_script( $handle, $echo );
+	}
 
-		$object_name = $this->registered[$handle]->extra['l10n'][0];
+	public function print_extra_script( $handle, $echo = true ) {
+		if ( !$output = $this->get_data( $handle, 'data' ) )
+			return;
 
-		$data = "var $object_name = {\n";
-		$eol = '';
-		foreach ( $this->registered[$handle]->extra['l10n'][1] as $var => $val ) {
-			if ( 'l10n_print_after' == $var ) {
-				$after = $val;
-				continue;
-			}
-			$data .= "$eol\t$var: \"" . esc_js( $val ) . '"';
-			$eol = ",\n";
-		}
-		$data .= "\n};\n";
-		$data .= isset($after) ? "$after\n" : '';
-
-		if ( $echo ) {
-			echo "<script type='text/javascript'>\n";
-			echo "/* <![CDATA[ */\n";
-			echo $data;
-			echo "/* ]]> */\n";
-			echo "</script>\n";
-			return true;
-		} else {
-			return $data;
-		}
+		if ( !$echo )
+			return $output;
+
+		echo "<script type='text/javascript'>\n"; // CDATA and type='text/javascript' is not needed for HTML 5
+		echo "/* <![CDATA[ */\n";
+		echo "$output\n";
+		echo "/* ]]> */\n";
+		echo "</script>\n";
+
+		return true;
 	}
 
-	function do_item( $handle, $group = false ) {
+	public function do_item( $handle, $group = false ) {
 		if ( !parent::do_item($handle) )
 			return false;
 
@@ -101,9 +106,17 @@ class WP_Scripts extends WP_Dependencies {
 		$src = $this->registered[$handle]->src;
 
 		if ( $this->do_concat ) {
+			/**
+			 * Filter the script loader source.
+			 *
+			 * @since 2.2.0
+			 *
+			 * @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) ) {
-				$this->print_code .= $this->print_scripts_l10n( $handle, false );
+				$this->print_code .= $this->print_extra_script( $handle, false );
 				$this->concat .= "$handle,";
 				$this->concat_version .= "$handle$ver";
 				return true;
@@ -113,19 +126,38 @@ class WP_Scripts extends WP_Dependencies {
 			}
 		}
 
-		$this->print_scripts_l10n( $handle );
-		if ( !preg_match('|^https?://|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
+		$this->print_extra_script( $handle );
+		if ( !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
 			$src = $this->base_url . $src;
 		}
 
 		if ( !empty($ver) )
 			$src = add_query_arg('ver', $ver, $src);
-		$src = esc_url(apply_filters( 'script_loader_src', $src, $handle ));
 
-		if ( $this->do_concat )
-			$this->print_html .= "<script type='text/javascript' src='$src'></script>\n";
-		else
-			echo "<script type='text/javascript' src='$src'></script>\n";
+		/** This filter is documented in wp-includes/class.wp-scripts.php */
+		$src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
+
+		if ( ! $src )
+			return true;
+
+		$tag = "<script type='text/javascript' src='$src'></script>\n";
+
+		/** 
+		 * Filter the HTML script tag of an enqueued script.
+		 *
+		 * @since 4.1.0
+		 *
+		 * @param string $tag    The `<script>` tag for the enqueued script.
+		 * @param string $handle The script's registered handle.
+		 * @param string $src    The script's source URL.
+		 */
+		$tag = apply_filters( 'script_loader_tag', $tag, $handle, $src );
+
+		if ( $this->do_concat ) {
+			$this->print_html .= $tag;
+		} else {
+			echo $tag;
+		}
 
 		return true;
 	}
@@ -133,64 +165,93 @@ class WP_Scripts extends WP_Dependencies {
 	/**
 	 * Localizes a script
 	 *
-	 * Localizes only if script has already been added
-	 *
-	 * @param string handle Script name
-	 * @param string object_name Name of JS object to hold l10n info
-	 * @param array l10n Array of JS var name => localized string
-	 * @return bool Successful localization
+	 * Localizes only if the script has already been added
 	 */
-	function localize( $handle, $object_name, $l10n ) {
-		if ( !$object_name || !$l10n )
-			return false;
-		return $this->add_data( $handle, 'l10n', array( $object_name, $l10n ) );
+	public function localize( $handle, $object_name, $l10n ) {
+		if ( $handle === 'jquery' )
+			$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'];
+			unset($l10n['l10n_print_after']);
+		}
+
+		foreach ( (array) $l10n as $key => $value ) {
+			if ( !is_scalar($value) )
+				continue;
+
+			$l10n[$key] = html_entity_decode( (string) $value, ENT_QUOTES, 'UTF-8');
+		}
+
+		$script = "var $object_name = " . wp_json_encode( $l10n ) . ';';
+
+		if ( !empty($after) )
+			$script .= "\n$after;";
+
+		$data = $this->get_data( $handle, 'data' );
+
+		if ( !empty( $data ) )
+			$script = "$data\n$script";
+
+		return $this->add_data( $handle, 'data', $script );
 	}
 
-	function set_group( $handle, $recursion, $group = false ) {
-		$grp = isset($this->registered[$handle]->extra['group']) ? (int) $this->registered[$handle]->extra['group'] : 0;
+	public function set_group( $handle, $recursion, $group = false ) {
+
+		if ( $this->registered[$handle]->args === 1 )
+			$grp = 1;
+		else
+			$grp = (int) $this->get_data( $handle, 'group' );
+
 		if ( false !== $group && $grp > $group )
 			$grp = $group;
 
 		return parent::set_group( $handle, $recursion, $grp );
 	}
 
-	function all_deps( $handles, $recursion = false, $group = false ) {
+	public function all_deps( $handles, $recursion = false, $group = false ) {
 		$r = parent::all_deps( $handles, $recursion );
-		if ( !$recursion )
+		if ( ! $recursion ) {
+			/**
+			 * Filter the list of script dependencies left to print.
+			 *
+			 * @since 2.3.0
+			 *
+			 * @param array $to_do An array of script dependencies.
+			 */
 			$this->to_do = apply_filters( 'print_scripts_array', $this->to_do );
+		}
 		return $r;
 	}
 
-	function do_head_items() {
+	public function do_head_items() {
 		$this->do_items(false, 0);
 		return $this->done;
 	}
 
-	function do_footer_items() {
-		if ( !empty($this->in_footer) ) {
-			foreach( $this->in_footer as $key => $handle ) {
-				if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
-					$this->do_item($handle);
-					$this->done[] = $handle;
-					unset( $this->in_footer[$key] );
-				}
-			}
-		}
+	public function do_footer_items() {
+		$this->do_items(false, 1);
 		return $this->done;
 	}
 
-	function in_default_dir($src) {
-		if ( ! $this->default_dirs )
+	public function in_default_dir( $src ) {
+		if ( ! $this->default_dirs ) {
 			return true;
+		}
+
+		if ( 0 === strpos( $src, '/' . WPINC . '/js/l10n' ) ) {
+			return false;
+		}
 
 		foreach ( (array) $this->default_dirs as $test ) {
-			if ( 0 === strpos($src, $test) )
+			if ( 0 === strpos( $src, $test ) ) {
 				return true;
+			}
 		}
 		return false;
 	}
 
-	function reset() {
+	public function reset() {
 		$this->do_concat = false;
 		$this->print_code = '';
 		$this->concat = '';