<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[31223] trunk: Add support for IE conditional comments for WP_Scripts to match the functionality of WP_Styles, including unit tests.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31223">31223</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31223","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-17 01:36:55 +0000 (Sat, 17 Jan 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/16024">#16024</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpscriptsphp">trunk/src/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunksrcwpincludesfunctionswpscriptsphp">trunk/src/wp-includes/functions.wp-scripts.php</a></li>
<li><a href="#trunktestsphpunittestsdependenciesscriptsphp">trunk/tests/phpunit/tests/dependencies/scripts.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-scripts.php 2015-01-16 23:35:24 UTC (rev 31222)
+++ trunk/src/wp-includes/class.wp-scripts.php 2015-01-17 01:36:55 UTC (rev 31223)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,16 +95,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $group && in_array($handle, $this->in_footer, true) )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->in_footer = array_diff( $this->in_footer, (array) $handle );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( null === $this->registered[$handle]->ver )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $obj = $this->registered[$handle];
+
+ if ( null === $obj->ver ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ver = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
- $ver = $this->registered[$handle]->ver ? $this->registered[$handle]->ver : $this->default_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $ver = $obj->ver ? $obj->ver : $this->default_version;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($this->args[$handle]) )
</span><span class="cx" style="display: block; padding: 0 10px"> $ver = $ver ? $ver . '&' . $this->args[$handle] : $this->args[$handle];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $src = $this->registered[$handle]->src;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $src = $obj->src;
+ $cond_before = $cond_after = '';
+ $conditional = isset( $obj->extra['conditional'] ) ? $obj->extra['conditional'] : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $conditional ) {
+ $cond_before = "<!--[if {$conditional}]>\n";
+ $cond_after = "<![endif]-->\n";
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->do_concat ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the script loader source.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $handle Script handle.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $srce = apply_filters( 'script_loader_src', $src, $handle );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->in_default_dir($srce) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->in_default_dir( $srce ) && ! $conditional ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->print_code .= $this->print_extra_script( $handle, false );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->concat .= "$handle,";
</span><span class="cx" style="display: block; padding: 0 10px"> $this->concat_version .= "$handle$ver";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,13 +136,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_conditional_data = $conditional && $this->get_data( $handle, 'data' );
+
+ if ( $has_conditional_data ) {
+ echo $cond_before;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->print_extra_script( $handle );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !preg_match('|^(https?:)?//|', $src) && ! ( $this->content_url && 0 === strpos($src, $this->content_url) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $has_conditional_data ) {
+ echo $cond_after;
+ }
+
+ if ( ! preg_match( '|^(https?:)?//|', $src ) && ! ( $this->content_url && 0 === strpos( $src, $this->content_url ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $src = $this->base_url . $src;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty($ver) )
- $src = add_query_arg('ver', $ver, $src);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $ver ) )
+ $src = add_query_arg( 'ver', $ver, $src );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/class.wp-scripts.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $src )
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = "<script type='text/javascript' src='$src'></script>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = "{$cond_before}<script type='text/javascript' src='$src'></script>\n{$cond_after}";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the HTML script tag of an enqueued script.
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionswpscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.wp-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.wp-scripts.php 2015-01-16 23:35:24 UTC (rev 31222)
+++ trunk/src/wp-includes/functions.wp-scripts.php 2015-01-17 01:36:55 UTC (rev 31223)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,3 +271,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return (bool) wp_scripts()->query( $handle, $list );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * 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 );
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsdependenciesscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/dependencies/scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/scripts.php 2015-01-16 23:35:24 UTC (rev 31222)
+++ trunk/tests/phpunit/tests/dependencies/scripts.php 2015-01-17 01:36:55 UTC (rev 31223)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,4 +84,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Cleanup
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts->base_url = $base_url_backup;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * 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' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>