Merge pull request #2696 from SergioCrisostomo/fix-2613

iterate non-enumerables in old IE also

Author: SergioCrisostomo

Source/Core/Core.js

@@ -57,24 +57,35 @@ var instanceOf = this.instanceOf = function(item, object){
 	return item instanceof object;
 };
 
-// Function overloading
-
-var Function = this.Function;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 
+/*<ltIE8>*/
 var enumerables = true;
 for (var i in {toString: 1}) enumerables = null;
 if (enumerables) enumerables = ['hasOwnProperty', 'valueOf', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'constructor'];
+function forEachObjectEnumberableKey(object, fn, bind) {
+	if (enumerables) for (var i = enumerables.length; i--;){
+		var k = enumberables[i];
+		// signature has key-value, so overloadSetter can directly pass the
+		// method function, without swapping arguments.
+		if (hasOwnProperty.call(object, k)) fn.call(bind, k, object[k]);
+	}
+}
+/*</ltIE8>*/
+
+// Function overloading
+
+var Function = this.Function;
 
 Function.prototype.overloadSetter = function(usePlural){
 	var self = this;
 	return function(a, b){
 		if (a == null) return this;
 		if (usePlural || typeof a != 'string'){
 			for (var k in a) self.call(this, k, a[k]);
-			if (enumerables) for (var i = enumerables.length; i--;){
-				k = enumerables[i];
-				if (a.hasOwnProperty(k)) self.call(this, k, a[k]);
-			}
+			/*<ltIE8>*/
+			forEachObjectEnumberableKey(a, self, this);
+			/*</ltIE8>*/
 		} else {
 			self.call(this, a, b);
 		}
@@ -301,16 +312,7 @@ Number.extend('random', function(min, max){
 	return Math.floor(Math.random() * (max - min + 1) + min);
 });
 
-// forEach, each
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-Object.extend('forEach', function(object, fn, bind){
-	for (var key in object){
-		if (hasOwnProperty.call(object, key)) fn.call(bind, object[key], key, object);
-	}
-});
-
-Object.each = Object.forEach;
+// forEach, each, keys
 
 Array.implement({
 
@@ -329,6 +331,32 @@ Array.implement({
 
 });
 
+Object.extend({
+
+	keys: function(object){
+		var keys = [];
+		for (var k in a){
+			if (hasOwnProperty.call(object, k)) keys.push(k);
+		}
+		/*<ltIE8>*/
+		forEachObjectEnumberableKey(object, function(k){
+			keys.push(k);
+		});
+		/*</ltIE8>*/
+		return keys;
+	},
+
+	forEach: function(object, fn, bind){
+		Object.keys(object).forEach(function(key){
+			fn.call(bind, object[key], key, object);
+		});
+	}
+
+});
+
+Object.each = Object.forEach;
+
+
 // Array & Object cloning, Object merging and appending
 
 var cloneOf = function(item){

Source/Types/Object.js

@@ -31,47 +31,48 @@ Object.extend({
 
 	map: function(object, fn, bind){
 		var results = {};
-		for (var key in object){
-			if (hasOwnProperty.call(object, key)) results[key] = fn.call(bind, object[key], key, object);
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var key = keys[i];
+			results[key] = fn.call(bind, object[key], key, object);
 		}
 		return results;
 	},
 
 	filter: function(object, fn, bind){
 		var results = {};
-		for (var key in object){
-			var value = object[key];
-			if (hasOwnProperty.call(object, key) && fn.call(bind, value, key, object)) results[key] = value;
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var key = keys[i], value = object[key];
+			if (fn.call(bind, value, key, object)) results[key] = value;
 		}
 		return results;
 	},
 
 	every: function(object, fn, bind){
-		for (var key in object){
-			if (hasOwnProperty.call(object, key) && !fn.call(bind, object[key], key)) return false;
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var key = keys[i];
+			if (!fn.call(bind, object[key], key)) return false;
 		}
 		return true;
 	},
 
 	some: function(object, fn, bind){
-		for (var key in object){
-			if (hasOwnProperty.call(object, key) && fn.call(bind, object[key], key)) return true;
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var key = keys[i];
+			if (fn.call(bind, object[key], key)) return true;
 		}
 		return false;
 	},
 
-	keys: function(object){
-		var keys = [];
-		for (var key in object){
-			if (hasOwnProperty.call(object, key)) keys.push(key);
-		}
-		return keys;
-	},
-
 	values: function(object){
 		var values = [];
-		for (var key in object){
-			if (hasOwnProperty.call(object, key)) values.push(object[key]);
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var k = keys[i];
+			values.push(object[k]);
 		}
 		return values;
 	},
@@ -81,8 +82,10 @@ Object.extend({
 	},
 
 	keyOf: function(object, value){
-		for (var key in object){
-			if (hasOwnProperty.call(object, key) && object[key] === value) return key;
+		var keys = Object.keys(object);
+		for (var i = 0; i < keys.length; i++){
+			var key = keys[i];
+			if (object[key] === value) return key;
 		}
 		return null;
 	},

Specs/Core/Core.js

@@ -779,6 +779,27 @@ describe('Type', function(){
 
 });
 
+describe('Object.keys', function(){	
+
+	var object = { a: 'string', b: 233, c: {} };
+
+	it('keys should return an empty array', function(){
+		expect(Object.keys({})).toEqual([]);
+	});
+
+	it('should return an array containing the keys of the object', function(){
+		expect(Object.keys(object)).toEqual(['a', 'b', 'c']);
+	});
+
+	it('should return an array containing non-enum keys', function(){
+		var buggy = {constructor: 'foo', valueOf: 'bar'};
+		var keys = Object.keys(buggy).join('');
+		expect(keys.indexOf('constructor') != -1).toBeTruthy();
+		expect(keys.indexOf('valueOf') != -1).toBeTruthy();
+	});
+
+});
+
 describe('Object.each', function(){
 
 	it('should call the function for each item in the object', function(){
@@ -790,6 +811,30 @@ describe('Object.each', function(){
 		expect(daysObj).toEqual({first: 'Sunday', second: 'Monday', third: 'Tuesday'});
 	});
 
+	it('should call non-enumerable properties too', function(){
+		var obj = {
+			foo: 'bar',
+			constructor: "constructor",
+			hasOwnProperty: "hasOwnProperty",
+			isPrototypeOf: "isPrototypeOf",
+			propertyIsEnumerable: "propertyIsEnumerable",
+			toLocaleString: "toLocaleString",
+			toString: "toString",
+			valueOf: "valueOf"
+		};
+
+		var keysInObject = true, iteration = 0;
+		var props = ['foo', 'hasOwnProperty', 'valueOf', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'constructor'].join('');
+
+		Object.each(obj, function(i, k){
+			iteration++;
+			if (props.indexOf(k) == -1) keysInObject = false;  
+		});
+
+		expect(keysInObject).toBeTruthy();
+		expect(iteration).toEqual(8);
+	});
+
 });
 
 describe('Array.each', function(){

Specs/Types/Object.js

@@ -70,16 +70,6 @@ describe("Object Methods", function(){
 		expect(Object.some(object, Type.isArray)).toBeFalsy();
 	});
 
-	// Object.keys
-
-	it('keys should return an empty array', function(){
-		expect(Object.keys({})).toEqual([]);
-	});
-
-	it('should return an array containing the keys of the object', function(){
-		expect(Object.keys(object)).toEqual(['a', 'b', 'c']);
-	});
-
 	// Object.values
 
 	it('values should return an empty array', function(){