cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/5561'

Browse source
This commit is contained in:
Tom Hughes 2025-01-27 19:24:07 +00:00
commit 7c47cde474
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/assets/javascripts/index/layers/data.js
View file

@ -61,11 +61,16 @@ OSM.initializeDataLayer = function (map) {
.click(add))); .click(add)));
} }
function displayLoadError(message) { function displayLoadError(message, close) {
$("#browse_status").html( $("#browse_status").html(
$("<div class='p-3'>").append( $("<div class='p-3'>").append(
$("<h2 class='flex-grow-1 text-break'>") $("<div class='d-flex'>").append(
.text(I18n.t("browse.start_rjs.load_data")), $("<h2 class='flex-grow-1 text-break'>")
.text(I18n.t("browse.start_rjs.load_data")),
$("<div>").append(
$("<button type='button' class='btn-close'>")
.attr("aria-label", I18n.t("javascripts.close"))
.click(close))),
$("<div>").append( $("<div>").append(
$("<div class='d-flex'>").append( $("<div class='d-flex'>").append(
$("<p class='alert alert-warning'>") $("<p class='alert alert-warning'>")
@ -128,12 +133,16 @@ OSM.initializeDataLayer = function (map) {
dataLoader = null; dataLoader = null;
if (textStatus === "abort") { return; } if (textStatus === "abort") { return; }
function closeError() {
$("#browse_status").empty();
}
if (XMLHttpRequest.status === 400 && XMLHttpRequest.responseText) { if (XMLHttpRequest.status === 400 && XMLHttpRequest.responseText) {
displayLoadError(XMLHttpRequest.responseText); displayLoadError(XMLHttpRequest.responseText, closeError);
} else if (XMLHttpRequest.statusText) { } else if (XMLHttpRequest.statusText) {
displayLoadError(XMLHttpRequest.statusText); displayLoadError(XMLHttpRequest.statusText, closeError);
} else { } else {
displayLoadError(String(XMLHttpRequest.status)); displayLoadError(String(XMLHttpRequest.status), closeError);
} }
} }
}); });