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

Merge pull request #980 from vovik/new-master

Browse Source 
fixes #972 by cleaning up a messy conditional
This commit is contained in:
brad dunbar
2012-02-09 05:57:02 -08:00
parent b1e2e69977 3761d28188
commit b3aed20119
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backbone.js
View File

@@ -511,8 +511,10 @@
if (!(model = models[i] = this._prepareModel(models[i], options))) {
throw new Error("Can't add an invalid model to a collection");
}
if (cids[cid = model.cid] || this._byCid[cid] ||
(((id = model.id) != null) && (ids[id] || this._byId[id]))) {
cid = model.cid;
id = model.id;
if (cids[cid] || this._byCid[cid] || (id != null && (ids[id] || this._byId[id]))) {
throw new Error("Can't add the same model to a collection twice");
}
cids[cid] = ids[id] = model;