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

Cleanup length checks.

Browse Source
This commit is contained in:
John-David Dalton
2014-12-18 11:23:14 -08:00
parent 56a11910db
commit 9735bffae5
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lodash.js
View File

@@ -432,7 +432,6 @@
*/ */
function arrayReduceRight(array, iteratee, accumulator, initFromArray) { function arrayReduceRight(array, iteratee, accumulator, initFromArray) {
var length = array.length; var length = array.length;
if (initFromArray && length) { if (initFromArray && length) {
accumulator = array[--length]; accumulator = array[--length];
} }
@@ -523,7 +522,7 @@
*/ */
function baseSlice(array) { function baseSlice(array) {
var index = -1, var index = -1,
length = array ? array.length : 0, length = array.length,
result = Array(length); result = Array(length);
while (++index < length) { while (++index < length) {
@@ -1709,7 +1708,7 @@
*/ */
function baseAt(collection, props) { function baseAt(collection, props) {
var index = -1, var index = -1,
length = collection ? collection.length : 0, length = collection.length,
isArr = isLength(length), isArr = isLength(length),
propsLength = props.length, propsLength = props.length,
result = Array(propsLength); result = Array(propsLength);
@@ -1744,7 +1743,7 @@
value = iteratee(value); value = iteratee(value);
var low = 0, var low = 0,
high = array ? array.length : low, high = array.length,
valIsNaN = value !== value, valIsNaN = value !== value,
valIsUndef = typeof value == 'undefined'; valIsUndef = typeof value == 'undefined';
@@ -2679,7 +2678,7 @@
var low = 0, var low = 0,
high = array ? array.length : low; high = array ? array.length : low;
if (iteratee || value !== value || typeof value == 'undefined' || high > HALF_MAX_ARRAY_LENGTH) { if (high && (iteratee || value !== value || typeof value == 'undefined' || high > HALF_MAX_ARRAY_LENGTH)) {
return baseBinaryIndex(array, value, iteratee, retHighest); return baseBinaryIndex(array, value, iteratee, retHighest);
} }
while (low < high) { while (low < high) {
@@ -5278,7 +5277,8 @@
* // => ['fred', 'pebbles'] * // => ['fred', 'pebbles']
*/ */
function at(collection) { function at(collection) {
if (!collection || isLength(collection.length)) { var length = collection ? collection.length : 0;
if (isLength(length)) {
collection = toIterable(collection); collection = toIterable(collection);
} }
return baseAt(collection, baseFlatten(arguments, false, false, 1)); return baseAt(collection, baseFlatten(arguments, false, false, 1));
@@ -5318,7 +5318,6 @@
*/ */
function includes(collection, target, fromIndex) { function includes(collection, target, fromIndex) {
var length = collection ? collection.length : 0; var length = collection ? collection.length : 0;
if (!isLength(length)) { if (!isLength(length)) {
collection = values(collection); collection = values(collection);
length = collection.length; length = collection.length;
@@ -6358,12 +6357,15 @@
*/ */
function toArray(collection) { function toArray(collection) {
var length = collection ? collection.length : 0; var length = collection ? collection.length : 0;
if (isLength(length)) { if (!isLength(length)) {
return (lodash.support.unindexedChars && isString(collection)) return values(collection);
? collection.split('')
: baseSlice(collection);
} }
return values(collection); if (!length) {
return [];
}
return (lodash.support.unindexedChars && isString(collection))
? collection.split('')
: baseSlice(collection);
} }
/** /**