null and undefined are invalid ids.

thinkt4nk · May 2, 2012 · 46d43ae · 46d43ae
1 parent e0d349a
commit 46d43ae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/backbone.js b/backbone.js
@@ -854,7 +854,7 @@
       }
       if (model && event === 'change:' + model.idAttribute) {
         delete this._byId[model.previous(model.idAttribute)];
-        this._byId[model.id] = model;
+        if (model.id != null) this._byId[model.id] = model;
       }
       this.trigger.apply(this, arguments);
     }

diff --git a/test/collection.js b/test/collection.js
@@ -589,4 +589,14 @@ $(document).ready(function() {
     ok(c.at(0) instanceof Model);
   });
 
+  test("null and undefined are invalid ids.", function() {
+    var model = new Backbone.Model({id: 1});
+    var collection = new Backbone.Collection([model]);
+    model.set({id: null});
+    ok(!collection.get('null'));
+    model.set({id: 1});
+    model.set({id: undefined});
+    ok(!collection.get('undefined'));
+  });
+
 });