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

Merge pull request #594 from megawac/equals

Browse source 
Refactor and optimize base equals
This commit is contained in:
Jürg Lehni 2015-08-21 15:36:51 +02:00
commit 4f17aa376d
1 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/core/Base.js
View file

@ -118,12 +118,6 @@ Base.inject(/** @lends Base# */{
* arrays and properties of objects.
*/
equals: function(obj1, obj2) {
function checkKeys(o1, o2) {
for (var i in o1)
if (o1.hasOwnProperty(i) && !o2.hasOwnProperty(i))
return false;
return true;
}
if (obj1 === obj2)
return true;
// Call #equals() on both obj1 and obj2
@ -131,28 +125,33 @@ Base.inject(/** @lends Base# */{
return obj1.equals(obj2);
if (obj2 && obj2.equals)
return obj2.equals(obj1);
// Compare arrays
if (Array.isArray(obj1) && Array.isArray(obj2)) {
if (obj1.length !== obj2.length)
return false;
for (var i = 0, l = obj1.length; i < l; i++) {
if (!Base.equals(obj1[i], obj2[i]))
return false;
}
return true;
}
// Deep compare objects or arraays
// Compare objects
if (obj1 && typeof obj1 === 'object'
&& obj2 && typeof obj2 === 'object') {
if (!checkKeys(obj1, obj2) || !checkKeys(obj2, obj1))
return false;
for (var i in obj1) {
if (obj1.hasOwnProperty(i)
&& !Base.equals(obj1[i], obj2[i]))
return false;
if (obj1 && obj2 &&
typeof obj1 === 'object' &&
typeof obj2 === 'object') {
// Compare arrays
if (Array.isArray(obj1) && Array.isArray(obj2)) {
if (obj1.length !== obj2.length) return false;
for (var i = 0, l = obj1.length; i < l; i++) {
if (!Base.equals(obj1[i], obj2[i])) return false;
}
} else {
// Deep compare objects.
var keys = Object.keys(obj1), key;
var length = keys.length;
// Ensure that both objects contain the same number of properties before comparing deep equality.
if (Object.keys(obj2).length !== length) return false;
while (length--) {
// Deep compare each member
key = keys[length];
if (!(obj2.hasOwnProperty(key) && Base.equals(obj1[key], obj2[key]))) return false;
}
}
return true;
}
return false;
},