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

Ensure the result of _.difference is based on the values of the first param only. [#1038]

Browse Source
This commit is contained in:
jdalton
2015-03-10 21:31:24 -07:00
parent 028234ba86
commit 56c5ebcb71
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lodash.src.js
View File

@@ -4363,18 +4363,10 @@
* _.difference([1, 2, 3], [4, 2]); * _.difference([1, 2, 3], [4, 2]);
* // => [1, 3] * // => [1, 3]
*/ */
function difference() { function difference(array) {
var args = arguments, return (isArray(array) || isArguments(array))
index = -1, ? baseDifference(array, baseFlatten(arguments, false, true, 1))
length = args.length; : [];
while (++index < length) {
var value = args[index];
if (isArray(value) || isArguments(value)) {
break;
}
}
return baseDifference(value, baseFlatten(args, false, true, ++index));
} }
/** /**
@@ -5570,7 +5562,9 @@
* // => [3] * // => [3]
*/ */
function without(array) { function without(array) {
return baseDifference(array, baseSlice(arguments, 1)); return (isArray(array) || isArguments(array))
? baseDifference(array, baseSlice(arguments, 1))
: [];
} }
/** /**

19
test/test.js
View File

@@ -3740,11 +3740,12 @@
deepEqual(_.difference([1, NaN, 3], largeArray), [1, 3]); deepEqual(_.difference([1, NaN, 3], largeArray), [1, 3]);
}); });
test('should ignore values that are not arrays or `arguments` objects', 3, function() { test('should ignore values that are not arrays or `arguments` objects', 4, function() {
var array = [0, 1, null, 3]; var array = [1, null, 3];
deepEqual(_.difference(array, 3, null, { '0': 1 }), array); deepEqual(_.difference(args, 3, { '0': 1 }), [1, 2, 3]);
deepEqual(_.difference(null, array, null, [2, 1]), [0, null, 3]); deepEqual(_.difference(null, array, 1), []);
deepEqual(_.difference(array, null, args, null), [0, null]); deepEqual(_.difference(array, args, null), [null]);
deepEqual(_.difference('abc', array, 'b'), []);
}); });
}(1, 2, 3)); }(1, 2, 3));
@@ -15173,7 +15174,11 @@
var array = [1, 2, 3, 1, 2, 3]; var array = [1, 2, 3, 1, 2, 3];
deepEqual(_.without(array, 1, 2), [3, 3]); deepEqual(_.without(array, 1, 2), [3, 3]);
}); });
}());
test('should treat string values for `array` as empty', 1, function() {
deepEqual(_.without('abc', 'b'), []);
});
}(1, 2, 3));
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
@@ -16134,7 +16139,7 @@
return '`_.' + methodName + '` should accept falsey primary arguments'; return '`_.' + methodName + '` should accept falsey primary arguments';
} }
deepEqual(_.difference(null, array), array, message('difference')); deepEqual(_.difference(null, array), [], message('difference'));
deepEqual(_.intersection(null, array), array, message('intersection')); deepEqual(_.intersection(null, array), array, message('intersection'));
deepEqual(_.union(null, array), array, message('union')); deepEqual(_.union(null, array), array, message('union'));
deepEqual(_.xor(null, array), array, message('xor')); deepEqual(_.xor(null, array), array, message('xor'));