Merge pull request #14635 from Snuffleupagus/loadStyles-fetch
Replace XMLHttpRequest usage with the Fetch API in `loadStyles` (in `test/driver.js`)
This commit is contained in:
commit
3ac2053d97
@ -44,24 +44,23 @@ function loadStyles(styles) {
|
||||
|
||||
for (const file of styles) {
|
||||
promises.push(
|
||||
new Promise(function (resolve, reject) {
|
||||
const xhr = new XMLHttpRequest();
|
||||
xhr.open("GET", file);
|
||||
xhr.onload = function () {
|
||||
resolve(xhr.responseText);
|
||||
};
|
||||
xhr.onerror = function (e) {
|
||||
reject(new Error(`Error fetching style (${file}): ${e}`));
|
||||
};
|
||||
xhr.send(null);
|
||||
})
|
||||
fetch(file)
|
||||
.then(response => {
|
||||
if (!response.ok) {
|
||||
throw new Error(response.statusText);
|
||||
}
|
||||
return response.text();
|
||||
})
|
||||
.catch(reason => {
|
||||
throw new Error(`Error fetching style (${file}): ${reason}`);
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
return Promise.all(promises);
|
||||
}
|
||||
|
||||
function writeSVG(svgElement, ctx, outputScale) {
|
||||
function writeSVG(svgElement, ctx) {
|
||||
// We need to have UTF-8 encoded XML.
|
||||
const svg_xml = unescape(
|
||||
encodeURIComponent(new XMLSerializer().serializeToString(svgElement))
|
||||
|
Loading…
Reference in New Issue
Block a user