Ensure _.includes matches an empty string on empty strings. [closes #1275]

This commit is contained in:
jdalton
2015-06-10 18:37:09 -07:00
parent 6b8ffb2a85
commit 1a28ef3244
2 changed files with 6 additions and 7 deletions

View File

@@ -6660,17 +6660,14 @@
collection = values(collection);
length = collection.length;
}
if (!length) {
return false;
}
if (typeof fromIndex != 'number' || (guard && isIterateeCall(target, fromIndex, guard))) {
fromIndex = 0;
} else {
fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0);
}
return (typeof collection == 'string' || !isArray(collection) && isString(collection))
? (fromIndex < length && collection.indexOf(target, fromIndex) > -1)
: (getIndexOf(collection, target, fromIndex) > -1);
? (fromIndex <= length && collection.indexOf(target, fromIndex) > -1)
: (!!length && getIndexOf(collection, target, fromIndex) > -1);
}
/**