<!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>[27171] trunk/src/wp-includes/js: Update media-views and wp.Backbone.View for Backbone 1.1.</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/27171">27171</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-02-13 07:36:01 +0000 (Thu, 13 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update media-views and wp.Backbone.View for Backbone 1.1.
* Collection set/add/remove/reset methods now return models, not `this`, so they can no longer be chained.
* Options passed to Backbone.View's constructor are no longer attached automatically. wp.Backbone.View now does this automatically.
See <a href="http://core.trac.wordpress.org/changeset/27170">[27170]</a> for Backbone 1.1 itself.
props gcorne.
fixes <a href="http://core.trac.wordpress.org/ticket/26799">#26799</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media-views.js</a></li>
<li><a href="#trunksrcwpincludesjswpbackbonejs">trunk/src/wp-includes/js/wp-backbone.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/media-views.js (27170 => 27171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/media-views.js 2014-02-13 07:33:29 UTC (rev 27170)
+++ trunk/src/wp-includes/js/media-views.js 2014-02-13 07:36:01 UTC (rev 27171)
</span><span class="lines">@@ -3566,13 +3566,15 @@
</span><span class="cx"> models = collection.models.slice( modelIndex, singleIndex + 1 );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- selection.add( models ).single( model );
</del><ins>+ selection.add( models );
+ selection.single( model );
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If the `method` is set to `toggle`, just flip the selection
</span><span class="cx"> // status, regardless of whether the model is the single model.
</span><span class="cx"> } else if ( 'toggle' === method ) {
</span><del>- selection[ this.selected() ? 'remove' : 'add' ]( model ).single( model );
</del><ins>+ selection[ this.selected() ? 'remove' : 'add' ]( model );
+ selection.single( model );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3589,7 +3591,8 @@
</span><span class="cx"> // If the model is not selected, run the `method` on the
</span><span class="cx"> // selection. By default, we `reset` the selection, but the
</span><span class="cx"> // `method` can be set to `add` the model to the selection.
</span><del>- selection[ method ]( model ).single( model );
</del><ins>+ selection[ method ]( model );
+ selection.single( model );
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -3994,7 +3997,8 @@
</span><span class="cx"> // Silently shift the model to its new index.
</span><span class="cx"> collection.remove( model, {
</span><span class="cx"> silent: true
</span><del>- }).add( model, {
</del><ins>+ });
+ collection.add( model, {
</ins><span class="cx"> silent: true,
</span><span class="cx"> at: ui.item.index()
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunksrcwpincludesjswpbackbonejs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/wp-backbone.js (27170 => 27171)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/wp-backbone.js 2014-02-13 07:33:29 UTC (rev 27170)
+++ trunk/src/wp-includes/js/wp-backbone.js 2014-02-13 07:36:01 UTC (rev 27171)
</span><span class="lines">@@ -340,10 +340,12 @@
</span><span class="cx"> // The constructor for the `Views` manager.
</span><span class="cx"> Subviews: wp.Backbone.Subviews,
</span><span class="cx">
</span><del>- constructor: function() {
</del><ins>+ constructor: function( options ) {
</ins><span class="cx"> this.views = new this.Subviews( this, this.views );
</span><span class="cx"> this.on( 'ready', this.ready, this );
</span><span class="cx">
</span><ins>+ this.options = options || {};
+
</ins><span class="cx"> Backbone.View.apply( this, arguments );
</span><span class="cx"> },
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>