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

Use a different private indicator for _.merge now that isPlainObject is exposed.

Browse Source 
Former-commit-id: 5c75de935eb3e5e9e035bd6520398c7fbd811ea6
This commit is contained in:
John-David Dalton
2012-09-24 01:06:58 -07:00
parent d0c94c1aef
commit 2fb93bac99
4 changed files with 146 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lodash.js
View File

@@ -791,7 +791,7 @@
var factory = Function(
'arrayLikeClasses, ArrayProto, bind, bindIterator, compareAscending, concat, ' +
'forIn, hasOwnProperty, identity, indexOf, isArguments, isArray, isFunction, ' +
'isPlainObject, objectClass, objectTypes, nativeKeys, propertyIsEnumerable, ' +
'isPlainObject, noop, objectClass, objectTypes, nativeKeys, propertyIsEnumerable, ' +
'slice, stringClass, toString, undefined',
'var callee = function(' + args + ') {\n' + iteratorTemplate(data) + '\n};\n' +
'return callee'
@@ -800,7 +800,7 @@
return factory(
arrayLikeClasses, ArrayProto, bind, bindIterator, compareAscending, concat,
forIn, hasOwnProperty, identity, indexOf, isArguments, isArray, isFunction,
isPlainObject, objectClass, objectTypes, nativeKeys, propertyIsEnumerable,
isPlainObject, noop, objectClass, objectTypes, nativeKeys, propertyIsEnumerable,
slice, stringClass, toString
);
}
@@ -1767,7 +1767,7 @@
'top':
'var argsLength, isArr, stackA, stackB,\n' +
' args = arguments, argsIndex = 0;\n' +
'if (indicator == isPlainObject) {\n' +
'if (indicator == noop) {\n' +
' argsLength = 2;\n' +
' stackA = args[3];\n' +
' stackB = args[4]\n' +
@@ -1792,7 +1792,7 @@
' ? (isArray(value) ? value : [])\n' +
' : (isPlainObject(value) ? value : {})\n' +
' );\n' +
' result[index] = callee(value, source, isPlainObject, stackA, stackB)\n' +
' result[index] = callee(value, source, noop, stackA, stackB)\n' +
' }\n' +
'} else if (source != null) {\n' +
' result[index] = source\n' +