jashkenas#4103 check if obj is Model in Collection.get (jashkenas#4104)

leoeco2000 · Dec 1, 2016 · 7da4ed7 · 7da4ed7
1 parent df3366d
commit 7da4ed7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/backbone.js b/backbone.js
@@ -998,7 +998,7 @@
     get: function(obj) {
       if (obj == null) return void 0;
       return this._byId[obj] ||
-        this._byId[this.modelId(obj.attributes || obj)] ||
+        this._byId[this.modelId(this._isModel(obj) ? obj.attributes : obj)] ||
         obj.cid && this._byId[obj.cid];
     },
 

diff --git a/test/collection.js b/test/collection.js
@@ -2074,4 +2074,9 @@
     assert.equal(fired, false);
   });
 
+  QUnit.test('get models with `attributes` key', function(assert) {
+    var model = {id: 1, attributes: {}};
+    var collection = new Backbone.Collection([model]);
+    assert.ok(collection.get(model));
+  });
 })(QUnit);