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

Fix baseIsEqual in Rhino, Ringo, Narwhal.

Browse Source
This commit is contained in:
John-David Dalton
2014-03-23 14:59:46 -07:00
parent 60aeba732d
commit e5c397203e
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lodash.js
View File

@@ -1579,12 +1579,14 @@
} }
// compare [[Class]] names // compare [[Class]] names
var valClass = toString.call(value), var valClass = toString.call(value),
othClass = toString.call(other); othClass = toString.call(other),
valIsArg = valClass == argsClass,
othIsArg = othClass == argsClass;
if (valClass == argsClass) { if (valIsArg) {
valClass = objectClass; valClass = objectClass;
} }
if (othClass == argsClass) { if (othIsArg) {
othClass = objectClass; othClass = objectClass;
} }
if (valClass != othClass) { if (valClass != othClass) {
@@ -1623,16 +1625,20 @@
if (valClass != objectClass || (!support.nodeClass && (isNode(value) || isNode(other)))) { if (valClass != objectClass || (!support.nodeClass && (isNode(value) || isNode(other)))) {
return false; return false;
} }
var hasValCtor = hasOwnProperty.call(value, 'constructor'), if (!support.argsObject) {
hasOthCtor = hasOwnProperty.call(other, 'constructor'); valIsArg = isArguments(value);
othIsArg = isArguments(other);
}
var hasValCtor = !valIsArg && hasOwnProperty.call(value, 'constructor'),
hasOthCtor = !othIsArg && hasOwnProperty.call(other, 'constructor');
if (hasValCtor !== hasOthCtor) { if (hasValCtor != hasOthCtor) {
return false; return false;
} }
if (!hasValCtor) { if (!hasValCtor) {
// in older versions of Opera, `arguments` objects have `Array` constructors // in older versions of Opera, `arguments` objects have `Array` constructors
var valCtor = !support.argsObject && isArguments(value) ? Object : value.constructor, var valCtor = valIsArg ? Object : value.constructor,
othCtor = !support.argsObject && isArguments(other) ? Object : other.constructor; othCtor = othIsArg ? Object : other.constructor;
// non `Object` object instances with different constructors are not equal // non `Object` object instances with different constructors are not equal
if (valCtor != othCtor && if (valCtor != othCtor &&