zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort SVG attributes alphabetically. (#252) 

* Sort SVG attributes alphabetically.

This makes the exported SVG deterministic and diffable.

* Simplify attr variable
master
Neil Fraser 2018-06-03 02:44:57 -07:00 committed by Jeff Schiller
parent 5469084919
commit 2deaf4710a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/svgcanvas.js
View File

@ -2968,9 +2968,10 @@ this.svgToString = function (elem, indent) {
if (elem) { if (elem) {
cleanupElement(elem); cleanupElement(elem);
const attrs = elem.attributes; const attrs = Array.from(elem.attributes);
let attr, i; let i;
const childs = elem.childNodes; const childs = elem.childNodes;
attrs.sort((a, b) => a.name > b.name ? -1 : 1);
for (i = 0; i < indent; i++) { out.push(' '); } for (i = 0; i < indent; i++) { out.push(' '); }
out.push('<'); out.push(elem.nodeName); out.push('<'); out.push(elem.nodeName);
@ -3022,7 +3023,7 @@ this.svgToString = function (elem, indent) {
i = attrs.length; i = attrs.length;
const attrNames = ['width', 'height', 'xmlns', 'x', 'y', 'viewBox', 'id', 'overflow']; const attrNames = ['width', 'height', 'xmlns', 'x', 'y', 'viewBox', 'id', 'overflow'];
while (i--) { while (i--) {
attr = attrs.item(i); let attr = attrs[i];
const attrVal = toXml(attr.value); const attrVal = toXml(attr.value);
// Namespaces have already been dealt with, so skip // Namespaces have already been dealt with, so skip
@ -3043,7 +3044,7 @@ this.svgToString = function (elem, indent) {
const mozAttrs = ['-moz-math-font-style', '_moz-math-font-style']; const mozAttrs = ['-moz-math-font-style', '_moz-math-font-style'];
for (i = attrs.length - 1; i >= 0; i--) { for (i = attrs.length - 1; i >= 0; i--) {
attr = attrs.item(i); let attr = attrs[i];
let attrVal = toXml(attr.value); let attrVal = toXml(attr.value);
// remove bogus attributes added by Gecko // remove bogus attributes added by Gecko
if (mozAttrs.includes(attr.localName)) { continue; } if (mozAttrs.includes(attr.localName)) { continue; }