From b8ce442044ebcf3bfb9426a0306f231e59cc9897 Mon Sep 17 00:00:00 2001
From: Daryl Koopersmith <dkoopersmith@gmail.com>
Date: Sat, 25 May 2013 21:38:12 +0000
Subject: [PATCH] Update the subview controller for the patterns found in
 Backbone 1.0.

Fixes #24424.


git-svn-id: http://core.svn.wordpress.org/trunk@24361 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/js/media-views.js | 40 +++++++++++++++++++++++++-
 wp-includes/js/wp-backbone.js | 53 +++++++++++------------------------
 2 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js
index 570527ec65..ac363b4812 100644
--- a/wp-includes/js/media-views.js
+++ b/wp-includes/js/media-views.js
@@ -847,7 +847,45 @@
 	// -------------
 	//
 	// The base view class.
-	media.View = wp.View;
+	//
+	// 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;
+
+			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 );
+		}
+	});
 
 	/**
 	 * wp.media.view.Frame
diff --git a/wp-includes/js/wp-backbone.js b/wp-includes/js/wp-backbone.js
index 2091ff49f5..79061d6048 100644
--- a/wp-includes/js/wp-backbone.js
+++ b/wp-includes/js/wp-backbone.js
@@ -126,7 +126,7 @@ window.wp = window.wp || {};
 						if ( view.__detach )
 							view.$el.detach();
 						else
-							view.dispose();
+							view.remove();
 					});
 
 					_.each( next, function( view ) {
@@ -182,9 +182,9 @@ window.wp = window.wp || {};
 		//
 		// Stops tracking `views` registered to a `selector`. If no `views` are
 		// set, then all of the `selector`'s subviews will be unregistered and
-		// disposed.
+		// removed.
 		//
-		// Accepts an `options` object. If `options.silent` is set, `dispose`
+		// Accepts an `options` object. If `options.silent` is set, `remove`
 		// will *not* be triggered on the unregistered views.
 		unset: function( selector, views, options ) {
 			var existing;
@@ -203,7 +203,7 @@ window.wp = window.wp || {};
 			}
 
 			if ( ! options || ! options.silent )
-				_.invoke( views, 'dispose' );
+				_.invoke( views, 'remove' );
 
 			return this;
 		},
@@ -235,14 +235,14 @@ window.wp = window.wp || {};
 			return this;
 		},
 
-		// ### Dispose all subviews
+		// ### Remove all subviews
 		//
-		// Triggers the `dispose()` method on all subviews. Detaches the master
+		// Triggers the `remove()` method on all subviews. Detaches the master
 		// view from its parent. Resets the internals of the views manager.
 		//
 		// Accepts an `options` object. If `options.silent` is set, `unset`
 		// will *not* be triggered on the master view's parent.
-		dispose: function( options ) {
+		remove: function( options ) {
 			if ( ! options || ! options.silent ) {
 				if ( this.parent && this.parent.views )
 					this.parent.views.unset( this.selector, this.view, { silent: true });
@@ -250,7 +250,7 @@ window.wp = window.wp || {};
 				delete this.selector;
 			}
 
-			_.invoke( this.all(), 'dispose' );
+			_.invoke( this.all(), 'remove' );
 			this._views = [];
 			return this;
 		},
@@ -361,42 +361,21 @@ window.wp = window.wp || {};
 		// The constructor for the `Views` manager.
 		Subviews: wp.Subviews,
 
-		constructor: function( options ) {
+		constructor: function() {
 			this.views = new this.Subviews( this, this.views );
 			this.on( 'ready', this.ready, this );
 
-			if ( options && options.controller )
-				this.controller = options.controller;
-
 			Backbone.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 master.
-			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 );
-
-			// Recursively dispose child views.
-			if ( this.views )
-				this.views.dispose();
-
-			return this;
-		},
-
 		remove: function() {
-			this.dispose();
-			return Backbone.View.prototype.remove.apply( this, arguments );
+			var result = Backbone.View.prototype.remove.apply( this, arguments );
+
+			// Recursively remove child views.
+			if ( this.views )
+				this.views.remove();
+
+			return result;
 		},
 
 		render: function() {