From 33487707232c6f3f462ae59bad5b2177154cd630 Mon Sep 17 00:00:00 2001 From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com> Date: Sat, 1 Aug 2026 06:37:46 +0200 Subject: [PATCH] Apply url changes part by part --- app/assets/javascripts/leaflet.map.js | 27 +++++++++++++++++-------- app/assets/javascripts/leaflet.share.js | 6 +++--- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/leaflet.map.js b/app/assets/javascripts/leaflet.map.js index 785ebcf37..17221a531 100644 --- a/app/assets/javascripts/leaflet.map.js +++ b/app/assets/javascripts/leaflet.map.js @@ -146,12 +146,13 @@ L.OSM.Map = L.Map.extend({ search.set("mlon", lng); } - const protocol = location.protocol, - hostname = OSM.SERVER_URL, - pathname = "/", - hash = OSM.formatHash(this); - - return `${protocol}//${hostname}${pathname}${search.toString() ? "?" + search : ""}${hash || ""}`; + return { + protocol: location.protocol, + hostname: OSM.SERVER_URL, + pathname: "/", + search, + hash: OSM.formatHash(this) + }; }, getShortUrl: function (marker) { @@ -209,7 +210,12 @@ L.OSM.Map = L.Map.extend({ search.set(this._object.type, this._object.id); } - return `${protocol}//${hostname}${pathname}${search.toString() ? "?" + search : ""}`; + return { + protocol, + hostname, + pathname, + search + }; }, getEmbedUrl: function (marker) { @@ -226,7 +232,12 @@ L.OSM.Map = L.Map.extend({ search.set("marker", latLng.lat + "," + latLng.lng); } - return `${protocol}//${hostname}${pathname}?${search}`; + return { + protocol, + hostname, + pathname, + search + }; }, getGeoUri: function (marker) { diff --git a/app/assets/javascripts/leaflet.share.js b/app/assets/javascripts/leaflet.share.js index b0c19098b..8601531fc 100644 --- a/app/assets/javascripts/leaflet.share.js +++ b/app/assets/javascripts/leaflet.share.js @@ -129,9 +129,9 @@ L.OSM.share = function (options) { // Link / Embed - $("#long_link").attr("href", map.getUrl(marker)); - $("#short_link").attr("href", map.getShortUrl(marker)); - $("#embed_link").attr("href", map.getEmbedUrl(marker)); + Object.assign($("#long_link")[0], map.getUrl(marker)); + Object.assign($("#short_link")[0], map.getShortUrl(marker)); + Object.assign($("#embed_link")[0], map.getEmbedUrl(marker)); $("#long_input").val($("#long_link").prop("href")); $("#short_input").val($("#short_link").prop("href")); -- 2.47.3