- Fix (Accessibility): Avoid duplicate IDs

This commit is contained in:
Brett Zamir
2019-11-23 21:18:21 +08:00
parent 3736fddb7f
commit 34721f2351
10 changed files with 20 additions and 9 deletions

View File

@@ -5057,7 +5057,7 @@ editor.init = function () {
`<svg xmlns="http://www.w3.org/2000/svg">
<rect width="16.5" height="16.5"
fill="#${cur.color}" opacity="${cur.opacity}"/>
<defs><linearGradient id="gradbox_"/></defs>
<defs><linearGradient id="gradbox_${PaintBox.ctr++}"/></defs>
</svg>`,
'text/xml'
);
@@ -5173,6 +5173,7 @@ editor.init = function () {
}
}
}
PaintBox.ctr = 0;
paintBox.fill = new PaintBox('#fill_color', 'fill');
paintBox.stroke = new PaintBox('#stroke_color', 'stroke');

View File

@@ -34388,7 +34388,7 @@
var cur = curConfig[type === 'fill' ? 'initFill' : 'initStroke']; // set up gradients to be used for the buttons
var svgdocbox = new DOMParser().parseFromString("<svg xmlns=\"http://www.w3.org/2000/svg\">\n <rect width=\"16.5\" height=\"16.5\"\n fill=\"#".concat(cur.color, "\" opacity=\"").concat(cur.opacity, "\"/>\n <defs><linearGradient id=\"gradbox_\"/></defs>\n </svg>"), 'text/xml');
var svgdocbox = new DOMParser().parseFromString("<svg xmlns=\"http://www.w3.org/2000/svg\">\n <rect width=\"16.5\" height=\"16.5\"\n fill=\"#".concat(cur.color, "\" opacity=\"").concat(cur.opacity, "\"/>\n <defs><linearGradient id=\"gradbox_").concat(PaintBox.ctr++, "\"/></defs>\n </svg>"), 'text/xml');
var docElem = svgdocbox.documentElement;
docElem = $$b(container)[0].appendChild(document.importNode(docElem, true));
docElem.setAttribute('width', 16.5);
@@ -34524,6 +34524,7 @@
return PaintBox;
}();
PaintBox.ctr = 0;
paintBox.fill = new PaintBox('#fill_color', 'fill');
paintBox.stroke = new PaintBox('#stroke_color', 'stroke');
$$b('#stroke_width').val(curConfig.initStroke.width);