Changeset 31223

Timestamp:

01/17/2015 01:36:55 AM (10 years ago)

Author:

azaozz

Message:

Add support for IE conditional comments for WP_Scripts to match the functionality of WP_Styles, including unit tests. Props filosofo, aaroncampbell, ethitter, georgestephanis, valendesigns. Fixes #16024.

Location:

trunk

Files:

• src/wp-includes/class.wp-scripts.php (modified) (4 diffs)
• src/wp-includes/functions.wp-scripts.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/scripts.php (modified) (1 diff)

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

@@ -96 +96 @@
             $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 = "<!--[if {$conditional}]>\n";
+            $cond_after = "<![endif]-->\n";
+        }
 
         if ( $this->do_concat ) {
@@ -116 +126 @@
              */
             $srce = apply_filters( 'script_loader_src', $src, $handle );
-            if ( $this->in_default_dir($srce) ) {
+            if ( $this->in_default_dir( ) {
                 $this->print_code .= $this->print_extra_script( $handle, false );
                 $this->concat .= "$handle,";
@@ -127 +137 @@
         }
 
+
+
+
+
+
+
         $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 ( !) )
+            $src = add_query_arg();
 
         /** This filter is documented in wp-includes/class.wp-scripts.php */
@@ -141 +162 @@
             return true;
 
-        $tag = "<script type='text/javascript' src='$src'></script>\n";
+        $tag = "";
 
         /**

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

@@ -272 +272 @@
     return (bool) wp_scripts()->query( $handle, $list );
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/tests/phpunit/tests/dependencies/scripts.php

@@ -85 +85 @@
         $wp_scripts->base_url = $base_url_backup;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }