github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #700 from iros/673

Browse Source 
#673 - Adding index as a property on the options object that gets passed
This commit is contained in:
Tim Branyen
2011-10-29 13:30:58 -07:00
parent fbffb36819 80769fcf99
commit 9982e314cb
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backbone.js
View File

@@ -600,6 +600,7 @@
this.models.splice(index, 0, model);
model.bind('all', this._onModelEvent);
this.length++;
options.index = index;
if (!options.silent) model.trigger('add', model, this, options);
return model;
},
@@ -612,8 +613,10 @@
if (!model) return null;
delete this._byId[model.id];
delete this._byCid[model.cid];
this.models.splice(this.indexOf(model), 1);
var index = this.indexOf(model);
this.models.splice(index, 1);
this.length--;
options.index = index;
if (!options.silent) model.trigger('remove', model, this, options);
this._removeReference(model);
return model;

34
test/collection.js
View File

@@ -122,6 +122,23 @@ $(document).ready(function() {
equals(atCol.last(), h);
});
test("Collection: add model to collection and verify index updates", function() {
var f = new Backbone.Model({id: 20, label : 'f'});
var g = new Backbone.Model({id: 21, label : 'g'});
var h = new Backbone.Model({id: 22, label : 'h'});
var col = new Backbone.Collection();
var counts = [];
col.bind('add', function(model, collection, options) {
counts.push(options.index);
});
col.add(f);
col.add(g);
col.add(h);
ok(_.isEqual(counts, [0,1,2]));
});
test("Collection: add model to collection twice", function() {
try {
// no id, same cid
@@ -173,6 +190,23 @@ $(document).ready(function() {
equals(otherRemoved, null);
});
test("Collection: remove should return correct index events", function() {
var f = new Backbone.Model({id: 20, label : 'f'});
var g = new Backbone.Model({id: 21, label : 'g'});
var h = new Backbone.Model({id: 22, label : 'h'});
var col = new Backbone.Collection([f,g,h]);
var counts = [];
col.bind('remove', function(model, collection, options) {
counts.push(options.index);
});
col.remove(h);
col.remove(g);
col.remove(f);
ok(_.isEqual(counts, [2,1,0]));
});
test("Collection: events are unbound on remove", function() {
var counter = 0;
var dj = new Backbone.Model();