Merge commit 'kriskowal/integration'

This commit is contained in:
Jeremy Ashkenas
2009-10-28 22:50:20 -04:00
2 changed files with 3 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
// ServerJS package specification.
{ {
"!": "This is a Narwhal package descriptor.",
"name": "underscore", "name": "underscore",
"description": "Functional programming aid for Javascript. Works well with jQuery.", "description": "Functional programming aid for Javascript. Works well with jQuery.",
"url": "http://documentcloud.github.com/underscore/", "url": "http://documentcloud.github.com/underscore/",
@@ -8,5 +8,5 @@
"maintainer": "Kris Kowal <kris.kowal@cixar.com>", "maintainer": "Kris Kowal <kris.kowal@cixar.com>",
"contributors": [], "contributors": [],
"dependencies": [], "dependencies": [],
"lib", "." "lib": "."
} }

View File

@@ -31,7 +31,7 @@
obj.each(function(value) { iterator.call(context, value, index++); }); obj.each(function(value) { iterator.call(context, value, index++); });
} else { } else {
var i = 0; var i = 0;
for (var key in obj) if (obj.hasOwnProperty(key)) { for (var key in obj) if (Object.prototype.hasOwnProperty.call(obj, key)) {
var value = obj[key], pair = [key, value]; var value = obj[key], pair = [key, value];
pair.key = key; pair.key = key;
pair.value = value; pair.value = value;