github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-04-30 03:00:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1955 from johtso/get-by-idattr

Browse Source 
Improve getting of models with non-default ids
This commit is contained in:
Jeremy Ashkenas
2012-12-17 13:42:57 -08:00
parent 132f123212 17fba9e8bd
commit 6f0e4cc8ae
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
backbone.js
View File

@@ -734,7 +734,9 @@
// Get a model from the set by id.
get: function(obj) {
if (obj == null) return void 0;
return this._byId[obj.id != null ? obj.id : obj] || this._byCid[obj.cid || obj];
var idAttr = this.model.prototype.idAttribute;
return this._byId[obj[idAttr] != null ? obj[idAttr] : obj.id != null ? obj.id : obj]
|| this._byCid[obj.cid || obj];
},
// Get the model at the given index.
@@ -781,7 +783,6 @@
update: function(models, options) {
var model, i, l, existing;
var add = [], remove = [], modelMap = {};
var idAttr = this.model.prototype.idAttribute;
options = _.extend({add: true, merge: true, remove: true}, options);
if (options.parse) models = this.parse(models, options);
@@ -794,7 +795,7 @@
// Determine which models to add and merge, and which to remove.
for (i = 0, l = models.length; i < l; i++) {
model = models[i];
existing = this.get(model.id || model.cid || model[idAttr]);
existing = this.get(model);
if (options.remove && existing) modelMap[existing.cid] = true;
if ((options.add && !existing) || (options.merge && existing)) {
add.push(model);

12
test/collection.js
View File

@@ -62,13 +62,15 @@ $(document).ready(function() {
strictEqual(collection.last().get('a'), 4);
});
test("get", 3, function() {
test("get", 5, function() {
equal(col.get(0), d);
equal(col.get(2), b);
equal(col.get({id: 1}), c);
equal(col.get(c.clone()), c);
equal(col.get(col.first().cid), col.first());
});
test("get with non-default ids", 2, function() {
test("get with non-default ids", 4, function() {
var col = new Backbone.Collection();
var MongoModel = Backbone.Model.extend({
idAttribute: '_id'
@@ -78,6 +80,12 @@ $(document).ready(function() {
equal(col.get(100), model);
model.set({_id: 101});
equal(col.get(101), model);
var Col2 = Backbone.Collection.extend({ model: MongoModel });
col2 = new Col2();
col2.push(model);
equal(col2.get({_id: 101}), model);
equal(col2.get(model.clone()), model);
});
test("update index when id changes", 3, function() {