Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-03 16:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build.

Browse Source 
Former-commit-id: e930621f522aae7c15502ac56fe9983943d2dc80
This commit is contained in:
John-David Dalton
2013-01-20 02:52:43 -08:00
parent 873cc63f94
commit 8b4d952929
5 changed files with 231 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lodash.underscore.js
View File

@@ -787,15 +787,17 @@
* _.assign({ 'name': 'moe' }, { 'age': 40 });
* // => { 'name': 'moe', 'age': 40 }
*/
function assign(object, source, guard) {
var args = arguments,
index = 0,
length = typeof guard == 'number' ? 2 : args.length;
while (++index < length) {
(isArray(args[index]) ? forEach : forOwn)(args[index], function(value, key) {
object[key] = value;
});
function assign(object) {
if (!object) {
return object;
}
for (var argsIndex = 1, argsLength = arguments.length; argsIndex < argsLength; argsIndex++) {
var iteratee = arguments[argsIndex];
if (iteratee) {
for (var key in iteratee) {
object[key] = iteratee[key];
}
}
}
return object;
}
@@ -857,17 +859,19 @@
* _.defaults(iceCream, { 'flavor': 'vanilla', 'sprinkles': 'rainbow' });
* // => { 'flavor': 'chocolate', 'sprinkles': 'rainbow' }
*/
function defaults(object, source, guard) {
var args = arguments,
index = 0,
length = typeof guard == 'number' ? 2 : args.length;
while (++index < length) {
(isArray(args[index]) ? forEach : forOwn)(args[index], function(value, key) {
if (object[key] == null) {
object[key] = value;
function defaults(object) {
if (!object) {
return object;
}
for (var argsIndex = 1, argsLength = arguments.length; argsIndex < argsLength; argsIndex++) {
var iteratee = arguments[argsIndex];
if (iteratee) {
for (var key in iteratee) {
if (object[key] == null) {
object[key] = iteratee[key];
}
}
});
}
}
return object;
}