<!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>[24367] trunk/wp-includes/js: Add Backbone property to the wp-backbone namespace.</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/24367">24367</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2013-05-26 06:34:33 +0000 (Sun, 26 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add Backbone property to the wp-backbone namespace. See <a href="http://core.trac.wordpress.org/ticket/24424">#24424</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsmediaviewsjs">trunk/wp-includes/js/media-views.js</a></li>
<li><a href="#trunkwpincludesjswpbackbonejs">trunk/wp-includes/js/wp-backbone.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-views.js (24366 => 24367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js      2013-05-26 05:55:49 UTC (rev 24366)
+++ trunk/wp-includes/js/media-views.js 2013-05-26 06:34:33 UTC (rev 24367)
</span><span class="lines">@@ -854,12 +854,12 @@
</span><span class="cx">  //
</span><span class="cx">  // This behavior has since been removed, and should not be used
</span><span class="cx">  // outside of the media manager.
</span><del>-       media.View = wp.View.extend({
</del><ins>+        media.View = wp.Backbone.View.extend({
</ins><span class="cx">           constructor: function( options ) {
</span><span class="cx">                  if ( options && options.controller )
</span><span class="cx">                          this.controller = options.controller;
</span><span class="cx"> 
</span><del>-                       wp.View.apply( this, arguments );
</del><ins>+                        wp.Backbone.View.apply( this, arguments );
</ins><span class="cx">           },
</span><span class="cx"> 
</span><span class="cx">          dispose: function() {
</span><span class="lines">@@ -883,7 +883,7 @@
</span><span class="cx"> 
</span><span class="cx">          remove: function() {
</span><span class="cx">                  this.dispose();
</span><del>-                       return wp.View.prototype.remove.apply( this, arguments );
</del><ins>+                        return wp.Backbone.View.prototype.remove.apply( this, arguments );
</ins><span class="cx">           }
</span><span class="cx">  });
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesjswpbackbonejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/wp-backbone.js (24366 => 24367)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/wp-backbone.js      2013-05-26 05:55:49 UTC (rev 24366)
+++ trunk/wp-includes/js/wp-backbone.js 2013-05-26 06:34:33 UTC (rev 24367)
</span><span class="lines">@@ -26,18 +26,22 @@
</span><span class="cx">  });
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-       // wp.Subviews
-       // -----------
</del><ins>+        // Create the WordPress Backbone namespace.
+       wp.Backbone = {};
+
+
+       // wp.Backbone.Subviews
+       // --------------------
</ins><span class="cx">   //
</span><span class="cx">  // A subview manager.
</span><del>-       wp.Subviews = function( view, views ) {
</del><ins>+        wp.Backbone.Subviews = function( view, views ) {
</ins><span class="cx">           this.view = view;
</span><span class="cx">          this._views = _.isArray( views ) ? { '': views } : views || {};
</span><span class="cx">  };
</span><span class="cx"> 
</span><del>-       wp.Subviews.extend = Backbone.Model.extend;
</del><ins>+        wp.Backbone.Subviews.extend = Backbone.Model.extend;
</ins><span class="cx"> 
</span><del>-       _.extend( wp.Subviews.prototype, {
</del><ins>+        _.extend( wp.Backbone.Subviews.prototype, {
</ins><span class="cx">           // ### Fetch all of the subviews
</span><span class="cx">          //
</span><span class="cx">          // Returns an array of all subviews.
</span><span class="lines">@@ -138,7 +142,7 @@
</span><span class="cx">                  this._views[ selector ] = next;
</span><span class="cx"> 
</span><span class="cx">                  _.each( views, function( subview ) {
</span><del>-                               var constructor = subview.Views || wp.Subviews,
</del><ins>+                                var constructor = subview.Views || wp.Backbone.Subviews,
</ins><span class="cx">                                   subviews = subview.views = subview.views || new constructor( subview );
</span><span class="cx">                          subviews.parent   = this.view;
</span><span class="cx">                          subviews.selector = selector;
</span><span class="lines">@@ -353,13 +357,13 @@
</span><span class="cx">  });
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-       // wp.View
-       // -------
</del><ins>+        // wp.Backbone.View
+       // ----------------
</ins><span class="cx">   //
</span><span class="cx">  // The base view class.
</span><del>-       wp.View = Backbone.View.extend({
</del><ins>+        wp.Backbone.View = Backbone.View.extend({
</ins><span class="cx">           // The constructor for the `Views` manager.
</span><del>-               Subviews: wp.Subviews,
</del><ins>+                Subviews: wp.Backbone.Subviews,
</ins><span class="cx"> 
</span><span class="cx">          constructor: function() {
</span><span class="cx">                  this.views = new this.Subviews( this, this.views );
</span></span></pre>
</div>
</div>

</body>
</html>