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

Ensure _.slice coerces start and end arguments appropriately.

Browse Source
This commit is contained in:
John-David Dalton
2014-03-12 09:11:29 -07:00
parent a4c15e5fa5
commit 3ca80a7bf3
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lodash.js
View File

@@ -2975,21 +2975,19 @@
var index = -1, var index = -1,
length = array ? array.length : 0; length = array ? array.length : 0;
if (typeof start == 'undefined') { start |= 0;
start = 0; if (start < 0) {
} else if (start < 0) {
start = nativeMax(length + start, 0); start = nativeMax(length + start, 0);
} else if (start > length) { } else if (start > length) {
start = length; start = length;
} }
if (typeof end == 'undefined') { end = typeof end == 'undefined' ? length : (end | 0);
end = length; if (end < 0) {
} else if (end < 0) {
end = nativeMax(length + end, 0); end = nativeMax(length + end, 0);
} else if (end > length) { } else if (end > length) {
end = length; end = length;
} }
length = (length = (end - start) | 0) < 0 ? 0 : length; length = start > end ? 0 : (end - start);
var result = Array(length); var result = Array(length);
while (++index < length) { while (++index < length) {

11
test/test.js
View File

@@ -6602,8 +6602,6 @@
QUnit.module('lodash.range'); QUnit.module('lodash.range');
(function() { (function() {
var func = _.range;
test('should work when passing a single `end` argument', 1, function() { test('should work when passing a single `end` argument', 1, function() {
deepEqual(_.range(4), [0, 1, 2, 3]); deepEqual(_.range(4), [0, 1, 2, 3]);
}); });
@@ -6640,8 +6638,8 @@
}); });
}); });
test('should coerce arguments to numbers', 1, function() { test('should coerce arguments to finite numbers', 1, function() {
var actual = [func('0',1), func('1'), func(0, 1, '1'), func(NaN), func(NaN, NaN)]; var actual = [_.range('0', 1), _.range('1'), _.range(0, 1, '1'), _.range(NaN), _.range(NaN, NaN)];
deepEqual(actual, [[0], [0], [0], [], []]); deepEqual(actual, [[0], [0], [0], [], []]);
}); });
}()); }());
@@ -7411,6 +7409,11 @@
deepEqual(_.slice(array, 0, end), []); deepEqual(_.slice(array, 0, end), []);
}); });
}); });
test('should coerce `start` and `end` to finite numbers', 1, function() {
var actual = [_.slice(array, '0', 1), _.slice(array, 0, '1'), _.slice(array, '1'), _.slice(array, NaN, 1), _.slice(array, 1, NaN)];
deepEqual(actual, [[1], [1], [2, 3], [1], []]);
});
}()); }());
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/