fix model when id property is shadowed by a method

canjs · Sep 7, 2012 · b865588 · b865588
1 parent f23da29
commit b865588
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/model/model.js b/model/model.js
@@ -23,7 +23,7 @@ steal('can/util','can/observe', function( can ) {
 		modelNum = 0,
 		ignoreHookup = /change.observe\d+/,
 		getId = function( inst ) {
-			return inst[inst.constructor.id];
+			return inst.__get(inst.constructor.id);
 		},
 		// Ajax `options` generator function
 		ajax = function( ajaxOb, data, type, dataType, success, error ) {

diff --git a/model/model_test.js b/model/model_test.js
@@ -6,6 +6,22 @@ module("can/model", {
 
 var isDojo = (typeof dojo !== "undefined");
 
+test("shadowed id", function(){
+	var MyModel = can.Model({
+		id: 'foo'
+	},{
+		foo: function() {
+			return this.attr('foo');
+		}
+	});
+
+	var newModel = new MyModel({});
+	ok(newModel.isNew(),'new model is isNew');
+	var oldModel = new MyModel({foo:'bar'});
+	ok(!oldModel.isNew(),'old model is not new');
+	equals(oldModel.foo(),'bar','method can coexist with attribute');
+});
+
 test("CRUD", function(){