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

Ensure _.indexOf and _.lastIndexOf match NaN when performing a binary search.

Browse Source
This commit is contained in:
John-David Dalton
2014-09-25 09:42:27 -07:00
parent a6a93148b4
commit dc9b320c4a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lodash.js
View File

@@ -3683,8 +3683,10 @@
if (typeof fromIndex == 'number') { if (typeof fromIndex == 'number') {
fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (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 array[index] === value ? index : -1; other = array[index];
return (value === value ? value === other : other !== other) ? index : -1;
} }
return baseIndexOf(array, value, fromIndex); return baseIndexOf(array, value, fromIndex);
} }
@@ -3821,7 +3823,8 @@
index = (fromIndex < 0 ? nativeMax(length + fromIndex, 0) : nativeMin(fromIndex || 0, length - 1)) + 1; index = (fromIndex < 0 ? nativeMax(length + fromIndex, 0) : nativeMin(fromIndex || 0, length - 1)) + 1;
} else if (fromIndex) { } else if (fromIndex) {
index = sortedLastIndex(array, value) - 1; index = sortedLastIndex(array, value) - 1;
return array[index] === value ? index : -1; var other = array[index];
return (value === value ? value === other : other !== other) ? index : -1;
} }
if (value !== value) { if (value !== value) {
return indexOfNaN(array, index, true); return indexOfNaN(array, index, true);

3
test/test.js
View File

@@ -7066,8 +7066,9 @@
strictEqual(func(empty, undefined, true), -1); strictEqual(func(empty, undefined, true), -1);
}); });
test('`_.' + methodName + '` should match `NaN`', 1, function() { test('`_.' + methodName + '` should match `NaN`', 2, function() {
strictEqual(func([1, NaN, 3], NaN), 1); strictEqual(func([1, NaN, 3], NaN), 1);
strictEqual(func([1, 3, NaN], NaN, true), 2);
}); });
}); });