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

Use isObject comboed with isArrayLike.

Browse Source
This commit is contained in:
John-David Dalton
2015-07-30 08:26:05 -07:00
parent 3935d5f2f7
commit 5c53809269
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lodash.js
View File

@@ -1866,7 +1866,7 @@
while (++index < length) { while (++index < length) {
var value = array[index]; var value = array[index];
if (isObjectLike(value) && isArrayLike(value) && if (isObject(value) && isArrayLike(value) &&
(isStrict || isArray(value) || isArguments(value))) { (isStrict || isArray(value) || isArguments(value))) {
if (isDeep) { if (isDeep) {
// Recursively flatten arrays (susceptible to call stack limits). // Recursively flatten arrays (susceptible to call stack limits).
@@ -2327,7 +2327,7 @@
if (isArray(srcValue) || isTypedArray(srcValue)) { if (isArray(srcValue) || isTypedArray(srcValue)) {
newValue = isArray(oldValue) newValue = isArray(oldValue)
? oldValue ? oldValue
: ((isObjectLike(oldValue) && isArrayLike(oldValue)) ? copyArray(oldValue) : []); : ((isObject(oldValue) && isArrayLike(oldValue)) ? copyArray(oldValue) : []);
} }
else if (isPlainObject(srcValue) || isArguments(srcValue)) { else if (isPlainObject(srcValue) || isArguments(srcValue)) {
newValue = isArguments(oldValue) newValue = isArguments(oldValue)
@@ -4260,7 +4260,7 @@
* // => [1, 3] * // => [1, 3]
*/ */
var difference = restParam(function(array, values) { var difference = restParam(function(array, values) {
return (isObjectLike(array) && isArrayLike(array)) return (isObject(array) && isArrayLike(array))
? baseDifference(array, baseFlatten(values, false, true)) ? baseDifference(array, baseFlatten(values, false, true))
: []; : [];
}); });
@@ -5295,7 +5295,7 @@
length = 0; length = 0;
array = arrayFilter(array, function(group) { array = arrayFilter(array, function(group) {
if (isArrayLike(group)) { if (isObject(group) && isArrayLike(group)) {
length = nativeMax(group.length, length); length = nativeMax(group.length, length);
return true; return true;
} }
@@ -5356,7 +5356,9 @@
* // => [3] * // => [3]
*/ */
var without = restParam(function(array, values) { var without = restParam(function(array, values) {
return isArrayLike(array) ? baseDifference(array, values) : []; return (isObject(array) && isArrayLike(array))
? baseDifference(array, values)
: [];
}); });
/** /**
@@ -5379,7 +5381,7 @@
while (++index < length) { while (++index < length) {
var array = arguments[index]; var array = arguments[index];
if (isArrayLike(array)) { if (isObject(array) && isArrayLike(array)) {
var result = result var result = result
? arrayPush(baseDifference(result, array), baseDifference(array, result)) ? arrayPush(baseDifference(result, array), baseDifference(array, result))
: array; : array;