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

Make nativeMax style consistent.

Browse Source
This commit is contained in:
John-David Dalton
2014-03-29 02:13:29 -07:00
parent 866d9dacb6
commit bb42b87f4e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lodash.js
View File

@@ -2691,7 +2691,7 @@
function indexOf(array, value, fromIndex) { function indexOf(array, value, fromIndex) {
var length = array ? array.length : 0; var length = array ? array.length : 0;
if (typeof fromIndex == 'number') { if (typeof fromIndex == 'number') {
fromIndex = fromIndex < 0 ? nativeMax(0, length + fromIndex) : (fromIndex || 0); fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0);
} else if (fromIndex) { } else if (fromIndex) {
var index = sortedIndex(array, value); var index = sortedIndex(array, value);
return (length && array[index] === value) ? index : -1; return (length && array[index] === value) ? index : -1;
@@ -2852,7 +2852,7 @@
var index = array ? array.length : 0; var index = array ? array.length : 0;
if (typeof fromIndex == 'number') { if (typeof fromIndex == 'number') {
fromIndex |= 0; fromIndex |= 0;
index = (fromIndex < 0 ? nativeMax(0, index + fromIndex) : nativeMin(fromIndex, index - 1)) + 1; index = (fromIndex < 0 ? nativeMax(index + fromIndex, 0) : nativeMin(fromIndex, index - 1)) + 1;
} }
while (index--) { while (index--) {
if (array[index] === value) { if (array[index] === value) {
@@ -3637,7 +3637,7 @@
: collection.indexOf(target, fromIndex) > -1; : collection.indexOf(target, fromIndex) > -1;
} }
var indexOf = getIndexOf(); var indexOf = getIndexOf();
fromIndex = fromIndex < 0 ? nativeMax(0, length + fromIndex) : fromIndex; fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : fromIndex;
return indexOf(collection, target, fromIndex) > -1; return indexOf(collection, target, fromIndex) > -1;
} }
var index = -1, var index = -1,
@@ -4522,7 +4522,7 @@
return length > 0 ? collection[baseRandom(0, length - 1)] : undefined; return length > 0 ? collection[baseRandom(0, length - 1)] : undefined;
} }
var result = shuffle(collection); var result = shuffle(collection);
result.length = nativeMin(nativeMax(0, n), result.length); result.length = nativeMin(nativeMax(n, 0), result.length);
return result; return result;
} }
@@ -8073,7 +8073,7 @@
// use `Array(length)` so engines like Chakra and V8 avoid slower modes // use `Array(length)` so engines like Chakra and V8 avoid slower modes
// http://youtu.be/XAqIpGU8ZZk#t=17m25s // http://youtu.be/XAqIpGU8ZZk#t=17m25s
var index = -1, var index = -1,
length = nativeMax(0, ceil((end - start) / (step || 1))), length = nativeMax(ceil((end - start) / (step || 1)), 0),
result = Array(length); result = Array(length);
while (++index < length) { while (++index < length) {