From 89a274bc16ffe1ba1921866867fe9dc7306a3fd4 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Mon, 1 Jun 2020 19:34:51 -0700
Subject: [PATCH] Improved robustness of SVG attribute matching
---
js/artInfrastructure.js | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/js/artInfrastructure.js b/js/artInfrastructure.js
index c709c72c034..6b3bf218b0e 100644
--- a/js/artInfrastructure.js
+++ b/js/artInfrastructure.js
@@ -98,24 +98,31 @@ App.Art.SvgQueue = class {
* @param {NamedNodeMap} right
*/
function equalAttributes(left, right) {
- /** get all the attribute names from an attribute list and sort them
+ /** get all the attribute names from an attribute list
* @param {NamedNodeMap} attrs
* @returns {string[]}
*/
- function sortedAttrNames(attrs) {
+ function attrNames(attrs) {
let names = [];
for (let index = 0; index < attrs.length; ++index) {
names.push(attrs[index].nodeName);
}
- names.sort();
return names;
}
- if (typeof(left) !== typeof(right)) {
- return false;
+ if (!left && !right) {
+ return true; // both are nullish, treat as equal
+ } else if (!left || !right) {
+ return false; // only one is nullish, not equal
}
- const allNames = _.union(sortedAttrNames(left), sortedAttrNames(right));
- return allNames.every((attr) => left[attr].nodeValue === right[attr].nodeValue);
+
+ const leftNames = attrNames(left), rightNames = attrNames(right);
+ const intersectionLength = _.intersection(leftNames, rightNames).length;
+ if (leftNames.length !== intersectionLength || rightNames.length !== intersectionLength) {
+ return false; // contain different attributes, not equal
+ }
+ // are all values equal?
+ return leftNames.every((attr) => left.getNamedItem(attr).nodeValue === right.getNamedItem(attr).nodeValue);
}
let frag = document.createDocumentFragment();
--
GitLab