Merge pull request #107 from canjs/setup-triggers-keys

not binding on __keys during setup
canjs · Jul 19, 2018 · b8d18d9 · b8d18d9
2 parents c1dca96 + 9bdf7ae
commit b8d18d9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/can-map.js b/can-map.js
@@ -656,7 +656,9 @@ canReflect.assignSymbols(Map.prototype,{
 
 	// -shape
 	"can.getOwnEnumerableKeys": function(){
-		ObservationRecorder.add(this, '__keys');
+		if (!this.__inSetup) {
+			ObservationRecorder.add(this, '__keys');
+		}
 		var enumerable = this.constructor.enumerable;
 		if(enumerable) {
 			return Object.keys(this._data).filter(function(key){

diff --git a/can-map_test.js b/can-map_test.js
@@ -524,3 +524,17 @@ QUnit.test("attr should work when remove === 'true'", function(assert) {
 	assert.equal(canReflect.getKeyValue(map, 1), "one");
 	assert.equal(map.attr(1), "one");
 });
+
+QUnit.test("constructor should not bind on __keys (#106)", function(assert) {
+	var map;
+
+	var comp = canCompute(function() {
+		map = new Map();
+	});
+
+	canReflect.onValue(comp, function() {});
+
+	map.attr('foo', 'bar');
+
+	assert.equal(map.attr('foo'), 'bar', 'map should not be reset');
+});