Merge master

This commit is contained in:
Pieter Vander Vennet 2024-07-09 16:56:19 +02:00
commit 214ba40dfa
66 changed files with 2226 additions and 1578 deletions

View file

@ -978,7 +978,16 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
}
}
xhr.send(content)
xhr.onerror = (ev: ProgressEvent<EventTarget>) => reject("Could not get "+url+", xhr status code is "+xhr.status+" ("+xhr.statusText+")")
xhr.onerror = (ev: ProgressEvent<EventTarget>) =>
reject(
"Could not get " +
url +
", xhr status code is " +
xhr.status +
" (" +
xhr.statusText +
")"
)
})
}
@ -1072,7 +1081,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
const injected = Utils.injectedDownloads[url]
if (injected !== undefined) {
console.debug("Using injected resource for test for URL", url)
return {content: injected}
return { content: injected }
}
const result = await Utils.downloadAdvanced(
url,