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

Make _.isString use _.isArray to reduce usage patterns.

Browse Source
This commit is contained in:
John-David Dalton
2015-09-16 19:09:16 -07:00
parent 1162d2edd5
commit 14e62ae8d2
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lodash.js
View File

@@ -6486,14 +6486,13 @@
*/ */
function includes(collection, target, fromIndex, guard) { function includes(collection, target, fromIndex, guard) {
collection = isArrayLike(collection) ? collection : values(collection); collection = isArrayLike(collection) ? collection : values(collection);
fromIndex = (fromIndex && !guard) ? toInteger(fromIndex) : 0;
var length = collection.length; var length = collection.length;
if (guard || !fromIndex) { if (fromIndex < 0) {
fromIndex = 0; fromIndex = nativeMax(length + fromIndex, 0);
} else {
fromIndex = toInteger(fromIndex);
fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : fromIndex;
} }
return (typeof collection == 'string' || !isArray(collection) && isString(collection)) return isString(collection)
? (fromIndex <= length && collection.indexOf(target, fromIndex) > -1) ? (fromIndex <= length && collection.indexOf(target, fromIndex) > -1)
: (!!length && getIndexOf(collection, target, fromIndex) > -1); : (!!length && getIndexOf(collection, target, fromIndex) > -1);
} }
@@ -6849,7 +6848,7 @@
} }
if (isArrayLike(collection)) { if (isArrayLike(collection)) {
var result = collection.length; var result = collection.length;
return (result && !isArray(collection) && isString(collection)) return (result && isString(collection))
? stringSize(collection) ? stringSize(collection)
: result; : result;
} }
@@ -8929,7 +8928,8 @@
* // => false * // => false
*/ */
function isString(value) { function isString(value) {
return typeof value == 'string' || (isObjectLike(value) && objToString.call(value) == stringTag); return typeof value == 'string' ||
(!isArray(value) && isObjectLike(value) && objToString.call(value) == stringTag);
} }
/** /**
@@ -9040,7 +9040,7 @@
return []; return [];
} }
if (isArrayLike(value)) { if (isArrayLike(value)) {
return (!isArray(value) && isString(value)) ? stringToArray(value) : copyArray(value); return isString(value) ? stringToArray(value) : copyArray(value);
} }
if (iteratorSymbol && value[iteratorSymbol]) { if (iteratorSymbol && value[iteratorSymbol]) {
return iteratorToArray(value[iteratorSymbol]()); return iteratorToArray(value[iteratorSymbol]());