Changeset 24361

Timestamp:

05/25/2013 09:38:12 PM (13 years ago)

Author:

koopersmith

Message:

Update the subview controller for the patterns found in Backbone 1.0.

Fixes #24424.

Location:

trunk/wp-includes/js

Files:

• media-views.js (modified) (1 diff)
• wp-backbone.js (modified) (6 diffs)

trunk/wp-includes/js/media-views.js

@@ -848 +848 @@
     //
     // 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 );
+        }
+    });
 
     /**

trunk/wp-includes/js/wp-backbone.js

@@ -127 +127 @@
                             view.$el.detach();
                         else
-                            view.dispose();
+                            view.remove();
                     });
 
@@ -183 +183 @@
         // Stops tracking `views` registered to a `selector`. If no `views` are
         // set, then all of the `selector`'s subviews will be unregistered and
-        // disposed.
-        //
-        // Accepts an `options` object. If `options.silent` is set, `dispose`
+        // removed.
+        //
+        // Accepts an `options` object. If `options.silent` is set, `remove`
         // will *not* be triggered on the unregistered views.
         unset: function( selector, views, options ) {
@@ -204 +204 @@
 
             if ( ! options || ! options.silent )
-                _.invoke( views, 'dispose' );
+                _.invoke( views, 'remove' );
 
             return this;
@@ -236 +236 @@
         },
 
-        // ### Dispose all subviews
-        //
-        // Triggers the `dispose()` method on all subviews. Detaches the master
+        // ### Remove all subviews
+        //
+        // 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 )
@@ -251 +251 @@
             }
 
-            _.invoke( this.all(), 'dispose' );
+            _.invoke( this.all(), 'remove' );
             this._views = [];
             return this;
@@ -362 +362 @@
         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.
+        remove: function() {
+            var result = Backbone.View.prototype.remove.apply( this, arguments );
+
+            // Recursively remove child views.
             if ( this.views )
-                this.views.dispose();
-
-            return this;
-        },
-
-        remove: function() {
-            this.dispose();
-            return Backbone.View.prototype.remove.apply( this, arguments );
+                this.views.remove();
+
+            return result;
         },