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

Fixes #836, Fixes #708 -- going back to previous stance: two models with the same id can't be added to the same collection.

Browse Source
This commit is contained in:
Jeremy Ashkenas
2012-01-11 17:03:30 -05:00
parent cb7090db77
commit 8cfb243b8e
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backbone.js
View File

@@ -422,10 +422,12 @@
models = slice.call(models);
for (i = 0, l = models.length; i < l; i++) {
var model = models[i] = this._prepareModel(models[i], options);
if (this._byCid[model.cid]) {
var hasId = model.id != null;
if (this._byCid[model.cid] || (hasId && this._byId[model.id])) {
throw new Error("Can't add the same model to a set twice");
}
this._byId[model.id] = this._byCid[model.cid] = model;
this._byCid[model.cid] = model;
if (hasId) this._byId[model.id] = model;
model.bind('all', this._onModelEvent, this);
this.length++;
}

13
test/collection.js
View File

@@ -136,7 +136,7 @@ $(document).ready(function() {
}
});
test("Collection: add model to collection twice", function() {
test("Collection: can't add model to collection twice", function() {
try {
// no id, same cid
var a2 = new Backbone.Model({label: a.label});
@@ -148,6 +148,17 @@ $(document).ready(function() {
}
});
test("Collection: can't add different model with same id to collection twice", function() {
var col = new Backbone.Collection;
try {
col.add({id: 101});
col.add({id: 101});
ok(false, "duplicate; expected add to fail");
} catch (e) {
equals(e.message, "Can't add the same model to a set twice");
}
});
test("Collection: add model to multiple collections", function() {
var counter = 0;
var e = new Backbone.Model({id: 10, label : 'e'});