X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0cd18eb02f853bfa93673f046b793bd53ac5aa68..cdacfafd11bd5265cc8d8b69468bca36010434ee:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index d61191fb4..4555553ee 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -22,7 +22,6 @@ //= require index/changeset //= require index/query //= require router -//= require qs/dist/qs $(document).ready(function () { var map = new L.OSM.Map("map", { @@ -98,9 +97,7 @@ $(document).ready(function () { var position = $("html").attr("dir") === "rtl" ? "topleft" : "topright"; function addControlGroup(controls) { - controls.forEach(function (control) { - control.addTo(map); - }); + for (const control of controls) control.addTo(map); var firstContainer = controls[0].getContainer(); $(firstContainer).find(".control-button").first() @@ -239,18 +236,18 @@ $(document).ready(function () { function remoteEditHandler(bbox, object) { var remoteEditHost = "http://127.0.0.1:8111", osmHost = location.protocol + "//" + location.host, - query = { + query = new URLSearchParams({ left: bbox.getWest() - 0.0001, top: bbox.getNorth() + 0.0001, right: bbox.getEast() + 0.0001, bottom: bbox.getSouth() - 0.0001 - }; + }); - if (object && object.type !== "note") query.select = object.type + object.id; // can't select notes - sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + Qs.stringify(query), function () { + if (object && object.type !== "note") query.set("select", object.type + object.id); // can't select notes + sendRemoteEditCommand(remoteEditHost + "/load_and_zoom?" + query, function () { if (object && object.type === "note") { - var noteQuery = { url: osmHost + OSM.apiUrl(object) }; - sendRemoteEditCommand(remoteEditHost + "/import?" + Qs.stringify(noteQuery)); + const noteQuery = new URLSearchParams({ url: osmHost + OSM.apiUrl(object) }); + sendRemoteEditCommand(remoteEditHost + "/import?" + noteQuery); } }); @@ -258,6 +255,7 @@ $(document).ready(function () { 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")); }); } @@ -294,9 +292,9 @@ $(document).ready(function () { }; page.load = function () { - var params = Qs.parse(location.search.substring(1)); - if (params.query) { - $("#sidebar .search_form input[name=query]").value(params.query); + const params = new URLSearchParams(location.search); + if (params.has("query")) { + $("#sidebar .search_form input[name=query]").value(params.get("query")); } if (!("autofocus" in document.createElement("input"))) { $("#sidebar .search_form input[name=query]").focus();