Changeset 31223

Timestamp:

01/17/2015 01:36:55 AM (12 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( $srce ) && ! $conditional ) {
                                 $this->print_code .= $this->print_extra_script( $handle, false );
                                 $this->concat .= "$handle,";
@@ -127 +137 @@
                 }
 
+                $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 */
@@ -141 +162 @@
                         return true;
 
-                $tag = "<script type='text/javascript' src='$src'></script>\n";
+                $tag = "{$cond_before}<script type='text/javascript' src='$src'></script>\n{$cond_after}";
 
                 /**

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

@@ -272 +272 @@
         return (bool) wp_scripts()->query( $handle, $list );
 }
+
+/**
+ * Add metadata to a script.
+ *
+ * Works only if the script has already been added.
+ *
+ * Possible values for $key and $value:
+ * 'conditional' string Comments for IE 6, lte IE 7, etc.
+ *
+ * @see WP_Dependency::add_data()
+ *
+ * @since 4.2.0
+ *
+ * @param string $handle Name of the script.
+ * @param string $key    Name of data point for which we're storing a value.
+ * @param mixed  $value  String containing the data to be added.
+ * @return bool True on success, false on failure.
+ */
+function wp_script_add_data( $handle, $key, $value ){
+        global $wp_scripts;
+        return $wp_scripts->add_data( $handle, $key, $value );
+}

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

@@ -85 +85 @@
                 $wp_scripts->base_url = $base_url_backup;
         }
+
+        /**
+         * Testing add data & conditional
+         * @ticket 16024
+         */
+        function test_wp_script_add_data() {
+                // Enqueue & add data
+                wp_enqueue_script( 'test-only-data', 'example.com', array(), null );
+                wp_script_add_data( 'test-only-data', 'data', 'testing' );
+                $expected = "<script type='text/javascript'>\n/* <![CDATA[ */\ntesting\n/* ]]> */\n</script>\n";
+                $expected.= "<script type='text/javascript' src='http://example.com'></script>\n";
+
+                // Enqueue & add conditional comments
+                wp_enqueue_script( 'test-only-conditional', 'example.com', array(), null );
+                wp_script_add_data( 'test-only-conditional', 'conditional', 'gt IE 7' );
+                $expected.= "<!--[if gt IE 7]>\n<script type='text/javascript' src='http://example.com'></script>\n<![endif]-->\n";
+
+                // Enqueue & add data plus conditional comments for both
+                wp_enqueue_script( 'test-conditional-with-data', 'example.com', array(), null );
+                wp_script_add_data( 'test-conditional-with-data', 'data', 'testing' );
+                wp_script_add_data( 'test-conditional-with-data', 'conditional', 'lt IE 9' );
+                $expected.= "<!--[if lt IE 9]>\n<script type='text/javascript'>\n/* <![CDATA[ */\ntesting\n/* ]]> */\n</script>\n<![endif]-->\n";
+                $expected.= "<!--[if lt IE 9]>\n<script type='text/javascript' src='http://example.com'></script>\n<![endif]-->\n";
+
+                // Enqueue & add an invalid key for brevity
+                wp_enqueue_script( 'test-invalid', 'example.com', array(), null );
+                wp_script_add_data( 'test-invalid', 'invalid', 'testing' );
+                $expected.= "<script type='text/javascript' src='http://example.com'></script>\n";
+
+                // Go!
+                $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+
+                // No scripts left to print
+                $this->assertEquals( '', get_echo( 'wp_print_scripts' ) );
+        }
 }