X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..53f4633144ed68c8b8fb5861f992b5489894a940:/wp-includes/class.wp-scripts.php?ds=sidebyside
diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index 9fa96e9d..2cca26c6 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -17,68 +17,93 @@
* @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 );
+ }
+
+ /**
+ * @access public
+ */
+ 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 3.3
+ * @see print_extra_script()
+ *
+ * @param string $handle
+ * @param bool $echo
+ * @return bool|string|void
+ */
+ 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];
+ /**
+ * @param string $handle
+ * @param bool $echo
+ * @return bool|string|void
+ */
+ 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 "\n";
- return true;
- } else {
- return $data;
- }
+ if ( !$echo )
+ return $output;
+
+ echo "\n";
+
+ return true;
}
- function do_item( $handle, $group = false ) {
+ /**
+ * @param string $handle Name of the item. Should be unique.
+ * @param int|bool $group
+ * @return bool True on success, false if not set.
+ */
+ public function do_item( $handle, $group = false ) {
if ( !parent::do_item($handle) )
return false;
@@ -90,16 +115,38 @@ class WP_Scripts extends WP_Dependencies {
if ( false === $group && in_array($handle, $this->in_footer, true) )
$this->in_footer = array_diff( $this->in_footer, (array) $handle );
- $ver = $this->registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version;
+ $obj = $this->registered[$handle];
+
+ if ( null === $obj->ver ) {
+ $ver = '';
+ } else {
+ $ver = $obj->ver ? $obj->ver : $this->default_version;
+ }
+
if ( isset($this->args[$handle]) )
- $ver .= '&' . $this->args[$handle];
+ $ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
- $src = $this->registered[$handle]->src;
+ $src = $obj->src;
+ $cond_before = $cond_after = '';
+ $conditional = isset( $obj->extra['conditional'] ) ? $obj->extra['conditional'] : '';
+
+ if ( $conditional ) {
+ $cond_before = "\n";
+ }
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 );
+ if ( $this->in_default_dir( $srce ) && ! $conditional ) {
+ $this->print_code .= $this->print_extra_script( $handle, false );
$this->concat .= "$handle,";
$this->concat_version .= "$handle$ver";
return true;
@@ -109,83 +156,170 @@ 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) ) ) {
+ $has_conditional_data = $conditional && $this->get_data( $handle, 'data' );
+
+ if ( $has_conditional_data ) {
+ echo $cond_before;
+ }
+
+ $this->print_extra_script( $handle );
+
+ if ( $has_conditional_data ) {
+ echo $cond_after;
+ }
+
+ if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
$src = $this->base_url . $src;
}
- $src = add_query_arg('ver', $ver, $src);
- $src = esc_url(apply_filters( 'script_loader_src', $src, $handle ));
+ if ( ! empty( $ver ) )
+ $src = add_query_arg( 'ver', $ver, $src );
- if ( $this->do_concat )
- $this->print_html .= "\n";
- else
- echo "\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 = "{$cond_before}\n{$cond_after}";
+
+ /**
+ * Filter the HTML script tag of an enqueued script.
+ *
+ * @since 4.1.0
+ *
+ * @param string $tag The `