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

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

Browse source
This commit is contained in:
Tom Hughes 2025-02-17 08:57:17 +00:00
commit 00108bc9b7
1 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/assets/javascripts/index.js
View file

@ -236,20 +236,20 @@ $(document).ready(function () {
}); });
if (object && object.type !== "note") query.set("select", object.type + object.id); // can't select notes if (object && object.type !== "note") query.set("select", object.type + object.id); // can't select notes
sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + query, function () { sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + query)
if (object && object.type === "note") { .then(() => {
const noteQuery = new URLSearchParams({ url: osmHost + OSM.apiUrl(object) }); if (object && object.type === "note") {
sendRemoteEditCommand(remoteEditHost + "/import?" + noteQuery); const noteQuery = new URLSearchParams({ url: osmHost + OSM.apiUrl(object) });
} sendRemoteEditCommand(remoteEditHost + "/import?" + noteQuery);
}); }
})
.catch(() => {
// eslint-disable-next-line no-alert
alert(I18n.t("site.index.remote_failed"));
});
function sendRemoteEditCommand(url, callback) { function sendRemoteEditCommand(url) {
fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(5000) }) return fetch(url, { mode: "no-cors", signal: AbortSignal.timeout(5000) });
.then(callback)
.catch(function () {
// eslint-disable-next-line no-alert
alert(I18n.t("site.index.remote_failed"));
});
} }
return false; return false;