<!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>[24361] trunk/wp-includes/js: Update the subview controller for the patterns found in Backbone 1.0.</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/24361">24361</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2013-05-25 21:38:12 +0000 (Sat, 25 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update the subview controller for the patterns found in Backbone 1.0.
Fixes <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 (24360 => 24361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-views.js 2013-05-25 21:03:04 UTC (rev 24360)
+++ trunk/wp-includes/js/media-views.js 2013-05-25 21:38:12 UTC (rev 24361)
</span><span class="lines">@@ -847,8 +847,46 @@
</span><span class="cx"> // -------------
</span><span class="cx"> //
</span><span class="cx"> // The base view class.
</span><del>- media.View = wp.View;
</del><ins>+ //
+ // Undelegating events, removing events from the model, and
+ // removing events from the controller mirror the code for
+ // `Backbone.View.dispose` in Backbone 0.9.8 development.
+ //
+ // This behavior has since been removed, and should not be used
+ // outside of the media manager.
+ media.View = wp.View.extend({
+ constructor: function( options ) {
+ if ( options && options.controller )
+ this.controller = options.controller;
</ins><span class="cx">
</span><ins>+ wp.View.apply( this, arguments );
+ },
+
+ dispose: function() {
+ // Undelegating events, removing events from the model, and
+ // removing events from the controller mirror the code for
+ // `Backbone.View.dispose` in Backbone 0.9.8 development.
+ this.undelegateEvents();
+
+ if ( this.model && this.model.off )
+ this.model.off( null, null, this );
+
+ if ( this.collection && this.collection.off )
+ this.collection.off( null, null, this );
+
+ // Unbind controller events.
+ if ( this.controller && this.controller.off )
+ this.controller.off( null, null, this );
+
+ return this;
+ },
+
+ remove: function() {
+ this.dispose();
+ return wp.View.prototype.remove.apply( this, arguments );
+ }
+ });
+
</ins><span class="cx"> /**
</span><span class="cx"> * wp.media.view.Frame
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesjswpbackbonejs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/wp-backbone.js (24360 => 24361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/wp-backbone.js 2013-05-25 21:03:04 UTC (rev 24360)
+++ trunk/wp-includes/js/wp-backbone.js 2013-05-25 21:38:12 UTC (rev 24361)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> if ( view.__detach )
</span><span class="cx"> view.$el.detach();
</span><span class="cx"> else
</span><del>- view.dispose();
</del><ins>+ view.remove();
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> _.each( next, function( view ) {
</span><span class="lines">@@ -182,9 +182,9 @@
</span><span class="cx"> //
</span><span class="cx"> // Stops tracking `views` registered to a `selector`. If no `views` are
</span><span class="cx"> // set, then all of the `selector`'s subviews will be unregistered and
</span><del>- // disposed.
</del><ins>+ // removed.
</ins><span class="cx"> //
</span><del>- // Accepts an `options` object. If `options.silent` is set, `dispose`
</del><ins>+ // Accepts an `options` object. If `options.silent` is set, `remove`
</ins><span class="cx"> // will *not* be triggered on the unregistered views.
</span><span class="cx"> unset: function( selector, views, options ) {
</span><span class="cx"> var existing;
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! options || ! options.silent )
</span><del>- _.invoke( views, 'dispose' );
</del><ins>+ _.invoke( views, 'remove' );
</ins><span class="cx">
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="lines">@@ -235,14 +235,14 @@
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- // ### Dispose all subviews
</del><ins>+ // ### Remove all subviews
</ins><span class="cx"> //
</span><del>- // Triggers the `dispose()` method on all subviews. Detaches the master
</del><ins>+ // Triggers the `remove()` method on all subviews. Detaches the master
</ins><span class="cx"> // view from its parent. Resets the internals of the views manager.
</span><span class="cx"> //
</span><span class="cx"> // Accepts an `options` object. If `options.silent` is set, `unset`
</span><span class="cx"> // will *not* be triggered on the master view's parent.
</span><del>- dispose: function( options ) {
</del><ins>+ remove: function( options ) {
</ins><span class="cx"> if ( ! options || ! options.silent ) {
</span><span class="cx"> if ( this.parent && this.parent.views )
</span><span class="cx"> this.parent.views.unset( this.selector, this.view, { silent: true });
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> delete this.selector;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _.invoke( this.all(), 'dispose' );
</del><ins>+ _.invoke( this.all(), 'remove' );
</ins><span class="cx"> this._views = [];
</span><span class="cx"> return this;
</span><span class="cx"> },
</span><span class="lines">@@ -361,44 +361,23 @@
</span><span class="cx"> // The constructor for the `Views` manager.
</span><span class="cx"> Subviews: wp.Subviews,
</span><span class="cx">
</span><del>- constructor: function( options ) {
</del><ins>+ constructor: function() {
</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><del>- if ( options && options.controller )
- this.controller = options.controller;
-
</del><span class="cx"> Backbone.View.apply( this, arguments );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- dispose: function() {
- // Undelegating events, removing events from the model, and
- // removing events from the controller mirror the code for
- // `Backbone.View.dispose` in Backbone master.
- this.undelegateEvents();
</del><ins>+ remove: function() {
+ var result = Backbone.View.prototype.remove.apply( this, arguments );
</ins><span class="cx">
</span><del>- if ( this.model && this.model.off )
- this.model.off( null, null, this );
-
- if ( this.collection && this.collection.off )
- this.collection.off( null, null, this );
-
- // Unbind controller events.
- if ( this.controller && this.controller.off )
- this.controller.off( null, null, this );
-
- // Recursively dispose child views.
</del><ins>+ // Recursively remove child views.
</ins><span class="cx"> if ( this.views )
</span><del>- this.views.dispose();
</del><ins>+ this.views.remove();
</ins><span class="cx">
</span><del>- return this;
</del><ins>+ return result;
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- remove: function() {
- this.dispose();
- return Backbone.View.prototype.remove.apply( this, arguments );
- },
-
</del><span class="cx"> render: function() {
</span><span class="cx"> var options;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>