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

Cleanup error object fork in baseIsEqual.

Browse Source
This commit is contained in:
John-David Dalton
2014-07-03 12:26:47 -07:00
parent 79d59ff9ca
commit 0a7fc6c48c
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lodash.js
View File

@@ -1964,28 +1964,31 @@
valIsArg = isArguments(value); valIsArg = isArguments(value);
othIsArg = isArguments(other); othIsArg = isArguments(other);
} }
var hasValCtor = !valIsArg && hasOwnProperty.call(value, 'constructor'), // in older versions of Opera, `arguments` objects have `Array` constructors
hasOthCtor = !othIsArg && hasOwnProperty.call(other, 'constructor'); var valCtor = valIsArg ? Object : value.constructor,
othCtor = othIsArg ? Object : other.constructor;
if (hasValCtor != hasOthCtor) {
return false;
}
if (!hasValCtor) {
// in older versions of Opera, `arguments` objects have `Array` constructors
var valCtor = valIsArg ? Object : value.constructor,
othCtor = othIsArg ? Object : other.constructor;
if (isErr) {
// error objects of different types are not equal // error objects of different types are not equal
if (isErr && valCtor.prototype.name != othCtor.prototype.name) { if (valCtor.prototype.name != othCtor.prototype.name) {
return false; return false;
} }
// non `Object` object instances with different constructors are not equal } else {
if (valCtor != othCtor && var valHasCtor = !valIsArg && hasOwnProperty.call(value, 'constructor'),
!(isFunction(valCtor) && valCtor instanceof valCtor && isFunction(othCtor) && othCtor instanceof othCtor) && othHasCtor = !othIsArg && hasOwnProperty.call(other, 'constructor');
('constructor' in value && 'constructor' in other)
) { if (valHasCtor != othHasCtor) {
return false; return false;
} }
if (!valHasCtor) {
// non `Object` object instances with different constructors are not equal
if (valCtor != othCtor &&
!(isFunction(valCtor) && valCtor instanceof valCtor && isFunction(othCtor) && othCtor instanceof othCtor) &&
('constructor' in value && 'constructor' in other)
) {
return false;
}
}
} }
var valProps = isErr ? ['message', 'name'] : keys(value), var valProps = isErr ? ['message', 'name'] : keys(value),
othProps = isErr ? valProps : keys(other); othProps = isErr ? valProps : keys(other);