From eafc46f6c496802a1d4f6919f0d1a4d922cd36b5 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Sat, 6 Jul 2013 14:43:38 -0700 Subject: [PATCH] Update `underscore` build `_.defaults` and `_.result` to match Underscore v1.5.0. Former-commit-id: 12f1ed2217b6d9c845a1be0acd7b8337be94f63f --- build.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.js b/build.js index 8e0faf36e..bdff77f9d 100755 --- a/build.js +++ b/build.js @@ -3092,7 +3092,7 @@ ' var iterable = arguments[argsIndex];', ' if (iterable) {', ' for (var key in iterable) {', - ' if (object[key] == null) {', + " if (typeof object[key] == 'undefined') {", ' object[key] = iterable[key];', ' }', ' }', @@ -3386,7 +3386,7 @@ if (!isLodashFunc('result')) { source = replaceFunction(source, 'result', [ 'function result(object, property) {', - ' var value = object ? object[property] : null;', + ' var value = object ? object[property] : undefined;', ' return isFunction(value) ? object[property]() : value;', '}' ].join('\n'));