Changeset 27171

Timestamp:

02/13/2014 07:36:01 AM (11 years ago)

Author:

nacin

Message:

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 [27170] for Backbone 1.1 itself.

props gcorne.
fixes #26799.

Location:

trunk/src/wp-includes/js

Files:

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

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

@@ -3567 +3567 @@
                 }
 
-                selection.add( models ).single( model );
+                selection.add( models );
+                selection.single( model );
                 return;
 
@@ -3573 +3574 @@
             // status, regardless of whether the model is the single model.
             } else if ( 'toggle' === method ) {
-                selection[ this.selected() ? 'remove' : 'add' ]( model ).single( model );
+                selection[ this.selected() ? 'remove' : 'add' ]( model );
+                selection.single( model );
                 return;
             }
@@ -3590 +3592 @@
                 // selection. By default, we `reset` the selection, but the
                 // `method` can be set to `add` the model to the selection.
-                selection[ method ]( model ).single( model );
+                selection[ method ]( model );
+                selection.single( model );
             }
         },
@@ -3995 +3998 @@
                     collection.remove( model, {
                         silent: true
-                    }).add( model, {
+                    });
+                    collection.add( model, {
                         silent: true,
                         at:     ui.item.index()

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

@@ -341 +341 @@
         Subviews: wp.Backbone.Subviews,
 
-        constructor: function() {
+        constructor: function( options ) {
             this.views = new this.Subviews( this, this.views );
             this.on( 'ready', this.ready, this );
+
+            this.options = options || {};
 
             Backbone.View.apply( this, arguments );