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

Ensure _.where returns elements that contain all source array values. [closes #583]

Browse Source
This commit is contained in:
John-David Dalton
2014-06-11 09:26:21 -07:00
parent ec89382e35
commit e5ccfc4446
2 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lodash.js
View File

@@ -1867,28 +1867,27 @@
length = value.length;
result = length == othLength;
if (result || isWhere) {
if (result || (isWhere && othLength > length)) {
// deep compare the contents, ignoring non-numeric properties
while (++index < length) {
var valValue = value[index];
if (isWhere) {
var othIndex = -1;
while (++othIndex < othLength) {
var othValue = other[othIndex];
result = baseIsEqual(valValue, othValue, callback, isWhere, stackA, stackB);
var othIndex = othLength;
while (othIndex--) {
result = baseIsEqual(valValue, other[othIndex], callback, isWhere, stackA, stackB);
if (result) {
break;
}
}
} else {
othValue = other[index];
var othValue = other[index];
result = callback ? callback(valValue, othValue, index) : undefined;
if (typeof result == 'undefined') {
result = baseIsEqual(valValue, othValue, callback, isWhere, stackA, stackB);
}
if (!result) {
break;
}
}
if (!result) {
break;
}
}
}
@@ -1911,8 +1910,8 @@
var key = valProps[index];
result = hasOwnProperty.call(other, key);
if (result) {
othValue = other[key];
valValue = value[key];
othValue = other[key];
result = callback ? callback(valValue, othValue, key) : undefined;
if (typeof result == 'undefined') {
result = baseIsEqual(valValue, othValue, callback, isWhere, stackA, stackB);