X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/48ab98cb1779cf2088c1351ac3dd3d0da6fb31d3..e0feb3b2e5b436a06bbb04fbc838d1cd6ec95399:/wp-includes/class.wp-scripts.php
diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index 89a9ec91..2cca26c6 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -35,6 +35,9 @@ class WP_Scripts extends WP_Dependencies {
add_action( 'init', array( $this, 'init' ), 0 );
}
+ /**
+ * @access public
+ */
public function init() {
/**
* Fires when the WP_Scripts instance is initialized.
@@ -47,24 +50,38 @@ class WP_Scripts extends WP_Dependencies {
}
/**
- * Prints scripts
+ * Prints scripts.
*
* 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.
*/
public function print_scripts( $handles = false, $group = false ) {
return $this->do_items( $handles, $group );
}
- // Deprecated since 3.3, see print_extra_script()
+ /**
+ * @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 );
}
+ /**
+ * @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;
@@ -81,6 +98,11 @@ class WP_Scripts extends WP_Dependencies {
return true;
}
+ /**
+ * @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;
@@ -93,15 +115,25 @@ 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 );
- if ( null === $this->registered[$handle]->ver )
+ $obj = $this->registered[$handle];
+
+ if ( null === $obj->ver ) {
$ver = '';
- else
- $ver = $this->registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version;
+ } else {
+ $ver = $obj->ver ? $obj->ver : $this->default_version;
+ }
if ( isset($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 ) {
/**
@@ -113,7 +145,7 @@ class WP_Scripts extends WP_Dependencies {
* @param string $handle Script handle.
*/
$srce = apply_filters( 'script_loader_src', $src, $handle );
- if ( $this->in_default_dir($srce) ) {
+ if ( $this->in_default_dir( $srce ) && ! $conditional ) {
$this->print_code .= $this->print_extra_script( $handle, false );
$this->concat .= "$handle,";
$this->concat_version .= "$handle$ver";
@@ -124,13 +156,24 @@ class WP_Scripts extends WP_Dependencies {
}
}
+ $has_conditional_data = $conditional && $this->get_data( $handle, 'data' );
+
+ if ( $has_conditional_data ) {
+ echo $cond_before;
+ }
+
$this->print_extra_script( $handle );
- if ( !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
+
+ 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;
}
- if ( !empty($ver) )
- $src = add_query_arg('ver', $ver, $src);
+ if ( ! empty( $ver ) )
+ $src = add_query_arg( 'ver', $ver, $src );
/** This filter is documented in wp-includes/class.wp-scripts.php */
$src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
@@ -138,18 +181,35 @@ class WP_Scripts extends WP_Dependencies {
if ( ! $src )
return true;
- if ( $this->do_concat )
- $this->print_html .= "\n";
- else
- echo "\n";
+ $tag = "{$cond_before}\n{$cond_after}";
+
+ /**
+ * Filter the HTML script tag of an enqueued script.
+ *
+ * @since 4.1.0
+ *
+ * @param string $tag The `