Update underscore build _.defaults and _.result to match Underscore v1.5.0.

Former-commit-id: 12f1ed2217b6d9c845a1be0acd7b8337be94f63f
This commit is contained in:
John-David Dalton
2013-07-06 14:43:38 -07:00
parent c0c36d3338
commit eafc46f6c4

View File

@@ -3092,7 +3092,7 @@
' var iterable = arguments[argsIndex];', ' var iterable = arguments[argsIndex];',
' if (iterable) {', ' if (iterable) {',
' for (var key in iterable) {', ' for (var key in iterable) {',
' if (object[key] == null) {', " if (typeof object[key] == 'undefined') {",
' object[key] = iterable[key];', ' object[key] = iterable[key];',
' }', ' }',
' }', ' }',
@@ -3386,7 +3386,7 @@
if (!isLodashFunc('result')) { if (!isLodashFunc('result')) {
source = replaceFunction(source, 'result', [ source = replaceFunction(source, 'result', [
'function result(object, property) {', 'function result(object, property) {',
' var value = object ? object[property] : null;', ' var value = object ? object[property] : undefined;',
' return isFunction(value) ? object[property]() : value;', ' return isFunction(value) ? object[property]() : value;',
'}' '}'
].join('\n')); ].join('\n'));