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

Make the guard checks in _.assign and _.defaults more thorough.

Browse Source
This commit is contained in:
John-David Dalton
2014-01-09 08:43:52 -08:00
parent f99668f551
commit 60b7f504e6
6 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lodash.js
View File

@@ -5169,10 +5169,10 @@
* defaults(object, { 'name': 'fred', 'employer': 'slate' });
* // => { 'name': 'barney', 'employer': 'slate' }
*/
function assign(object, source, guard) {
function assign(object, source) {
var args = arguments,
argsIndex = 0,
argsLength = typeof guard == 'number' ? 2 : args.length;
argsLength = args[3] && args[3][args[2]] === source ? 2 : args.length;
if (argsLength > 3 && typeof args[argsLength - 2] == 'function') {
var callback = baseCreateCallback(args[--argsLength - 1], args[argsLength--], 2);
@@ -5338,8 +5338,6 @@
* @category Objects
* @param {Object} object The destination object.
* @param {...Object} [source] The source objects.
* @param- {Object} [guard] Allows working with `_.reduce` without using its
* `key` and `object` arguments as sources.
* @returns {Object} Returns the destination object.
* @example
*
@@ -5347,10 +5345,10 @@
* _.defaults(object, { 'name': 'fred', 'employer': 'slate' });
* // => { 'name': 'barney', 'employer': 'slate' }
*/
function defaults(object, source, guard) {
function defaults(object, source) {
var args = arguments,
argsIndex = 0,
argsLength = typeof guard == 'number' ? 2 : args.length;
argsLength = args[3] && args[3][args[2]] === source ? 2 : args.length;
while (++argsIndex < argsLength) {
source = args[argsIndex];