scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-08 22:01:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve Base#equals().

Browse source
This commit is contained in:
Jürg Lehni 2013-02-11 18:24:08 -08:00
parent 629e16144a
commit aa6e2fae09
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/Base.js
View file

@ -80,13 +80,12 @@ this.Base = Base.inject(/** @lends Base# */{
return false; return false;
return true; return true;
} }
if (obj1 == obj2) if (obj1 == obj2)
return true; return true;
// Call #equals() on both obj1 and obj2 // Call #equals() on both obj1 and obj2
if (obj1 != null && obj1.equals) if (obj1 && obj1.equals)
return obj1.equals(obj2); return obj1.equals(obj2);
if (obj2 != null && obj2.equals) if (obj2 && obj2.equals)
return obj2.equals(obj1); return obj2.equals(obj1);
// Compare arrays // Compare arrays
if (Array.isArray(obj1) && Array.isArray(obj2)) { if (Array.isArray(obj1) && Array.isArray(obj2)) {
@ -99,7 +98,8 @@ this.Base = Base.inject(/** @lends Base# */{
return true; return true;
} }
// Compare objects // Compare objects
if (typeof obj1 === 'object' && typeof obj2 === 'object') { if (obj1 && typeof obj1 === 'object'
&& obj2 && typeof obj2 === 'object') {
if (!checkKeys(obj1, obj2) || !checkKeys(obj2, obj1)) if (!checkKeys(obj1, obj2) || !checkKeys(obj2, obj1))
return false; return false;
for (var i in obj1) { for (var i in obj1) {