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

Ensure find methods work with strings.

Browse Source
This commit is contained in:
John-David Dalton
2014-03-15 03:41:31 -07:00
parent 819fa88eb7
commit 07434b19ae
2 changed files with 85 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
lodash.js
View File

@@ -3797,14 +3797,27 @@
* // => { 'name': 'fred', 'age': 40, 'blocked': true }
*/
function find(collection, predicate, thisArg) {
var length = collection ? collection.length : 0;
predicate = lodash.createCallback(predicate, thisArg, 3);
if (isArray(collection)) {
var index = -1,
length = collection.length;
if (typeof length == 'number' && length > -1 && length <= maxSafeInteger) {
var index = findIndex(collection, predicate, thisArg);
return index > -1 ? collection[index] : undefined;
while (++index < length) {
var value = collection[index];
if (predicate(value, index, collection)) {
return value;
}
}
} else {
var result;
baseEach(collection, function(value, index, collection) {
if (predicate(value, index, collection)) {
result = value;
return false;
}
});
return result;
}
var key = findKey(collection, predicate, thisArg);
return typeof key == 'string' ? collection[key] : undefined;
}
/**
@@ -3828,14 +3841,16 @@
* // => 3
*/
function findLast(collection, predicate, thisArg) {
var length = collection ? collection.length : 0;
var result;
if (typeof length == 'number' && length > -1 && length <= maxSafeInteger) {
var index = findLastIndex(collection, predicate, thisArg);
return index > -1 ? collection[index] : undefined;
}
var key = findLastKey(collection, predicate, thisArg);
return typeof key == 'string' ? collection[key] : undefined;
predicate = lodash.createCallback(predicate, thisArg, 3);
baseEachRight(collection, function(value, index, collection) {
if (predicate(value, index, collection)) {
result = value;
return false;
}
});
return result;
}
/**