<!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>[24368] trunk/wp-includes: Branch the generic JS utilities from the Backbone commands.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/24368">24368</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2013-05-26 06:43:13 +0000 (Sun, 26 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Branch the generic JS utilities from the Backbone commands. See <a href="http://core.trac.wordpress.org/ticket/24424">#24424</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjswpbackbonejs">trunk/wp-includes/js/wp-backbone.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpincludesjswputiljs">trunk/wp-includes/js/wp-util.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjswpbackbonejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/wp-backbone.js (24367 => 24368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/wp-backbone.js      2013-05-26 06:34:33 UTC (rev 24367)
+++ trunk/wp-includes/js/wp-backbone.js 2013-05-26 06:43:13 UTC (rev 24368)
</span><span class="lines">@@ -1,31 +1,6 @@
</span><span class="cx"> window.wp = window.wp || {};
</span><span class="cx"> 
</span><span class="cx"> (function ($) {
</span><del>-       /**
-        * wp.template( id )
-        *
-        * Fetches a template by id.
-        *
-        * @param  {string} id   A string that corresponds to a DOM element with an id prefixed with "tmpl-".
-        *                       For example, "attachment" maps to "tmpl-attachment".
-        * @return {function}    A function that lazily-compiles the template requested.
-        */
-       wp.template = _.memoize(function ( id ) {
-               var compiled,
-                       options = {
-                               evaluate:    /<#([\s\S]+?)#>/g,
-                               interpolate: /\{\{\{([\s\S]+?)\}\}\}/g,
-                               escape:      /\{\{([^\}]+?)\}\}(?!\})/g,
-                               variable:    'data'
-                       };
-
-               return function ( data ) {
-                       compiled = compiled || _.template( $( '#tmpl-' + id ).html(), null, options );
-                       return compiled( data );
-               };
-       });
-
-
</del><span class="cx">   // Create the WordPress Backbone namespace.
</span><span class="cx">  wp.Backbone = {};
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesjswputiljsfromrev24367trunkwpincludesjswpbackbonejs"></a>
<div class="copfile"><h4>Copied: trunk/wp-includes/js/wp-util.js (from rev 24367, trunk/wp-includes/js/wp-backbone.js) (0 => 24368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/wp-util.js                          (rev 0)
+++ trunk/wp-includes/js/wp-util.js     2013-05-26 06:43:13 UTC (rev 24368)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+window.wp = window.wp || {};
+
+(function ($) {
+       /**
+        * wp.template( id )
+        *
+        * Fetches a template by id.
+        *
+        * @param  {string} id   A string that corresponds to a DOM element with an id prefixed with "tmpl-".
+        *                       For example, "attachment" maps to "tmpl-attachment".
+        * @return {function}    A function that lazily-compiles the template requested.
+        */
+       wp.template = _.memoize(function ( id ) {
+               var compiled,
+                       options = {
+                               evaluate:    /<#([\s\S]+?)#>/g,
+                               interpolate: /\{\{\{([\s\S]+?)\}\}\}/g,
+                               escape:      /\{\{([^\}]+?)\}\}(?!\})/g,
+                               variable:    'data'
+                       };
+
+               return function ( data ) {
+                       compiled = compiled || _.template( $( '#tmpl-' + id ).html(), null, options );
+                       return compiled( data );
+               };
+       });
+}(jQuery));
</ins></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (24367 => 24368)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php      2013-05-26 06:34:33 UTC (rev 24367)
+++ trunk/wp-includes/script-loader.php 2013-05-26 06:43:13 UTC (rev 24368)
</span><span class="lines">@@ -273,8 +273,10 @@
</span><span class="cx"> 
</span><span class="cx">  $scripts->add( 'underscore', '/wp-includes/js/underscore.min.js', array(), '1.4.4', 1 );
</span><span class="cx">  $scripts->add( 'backbone', '/wp-includes/js/backbone.min.js', array('underscore','jquery'), '1.0.0', 1 );
</span><del>-       $scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone'), false, 1 );
</del><span class="cx"> 
</span><ins>+       $scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array('underscore', 'jquery'), false, 1 );
+       $scripts->add( 'wp-backbone', "/wp-includes/js/wp-backbone$suffix.js", array('backbone', 'wp-util'), false, 1 );
+
</ins><span class="cx">   $scripts->add( 'revisions', "/wp-admin/js/revisions$suffix.js", array( 'wp-backbone', 'jquery-ui-slider', 'jquery-ui-tooltip' ), false, 1 );
</span><span class="cx"> 
</span><span class="cx">  $scripts->add( 'imgareaselect', "/wp-includes/js/imgareaselect/jquery.imgareaselect$suffix.js", array('jquery'), '0.9.8', 1 );
</span></span></pre>
</div>
</div>

</body>
</html>