X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c47cb299a842a2eb7d022fcf4f0d02c08001f928..18f03fe59b71d9eb08d7864b3d5b5a86c56e4972:/app/assets/javascripts/index/changeset.js diff --git a/app/assets/javascripts/index/changeset.js b/app/assets/javascripts/index/changeset.js index 1ec5940b2..6feefbc2d 100644 --- a/app/assets/javascripts/index/changeset.js +++ b/app/assets/javascripts/index/changeset.js @@ -12,7 +12,7 @@ OSM.Changeset = function (map) { const changesetData = content.find("[data-changeset]").data("changeset"); changesetData.type = "changeset"; - const hashParams = OSM.parseHash(window.location.hash); + const hashParams = OSM.parseHash(location.hash); initialize(); map.addObject(changesetData, function (bounds) { if (!hashParams.center && bounds.isValid()) { @@ -24,33 +24,36 @@ OSM.Changeset = function (map) { }; function updateChangeset(method, url, include_data) { - let data; + const data = new URLSearchParams(); content.find("#comment-error").prop("hidden", true); content.find("button[data-method][data-url]").prop("disabled", true); if (include_data) { - data = { text: content.find("textarea").val() }; - } else { - data = {}; + data.set("text", content.find("textarea").val()); } - $.ajax({ - url: url, - type: method, - oauth: true, - data: data, - success: function () { - OSM.loadSidebarContent(window.location.pathname, page.load); - }, - error: function (xhr) { + fetch(url, { + method: method, + headers: { ...OSM.oauth }, + body: data + }) + .then(response => { + if (response.ok) return response; + return response.text().then(text => { + throw new Error(text); + }); + }) + .then(() => { + OSM.loadSidebarContent(location.pathname, page.load); + }) + .catch(error => { content.find("button[data-method][data-url]").prop("disabled", false); content.find("#comment-error") - .text(xhr.responseText) + .text(error.message) .prop("hidden", false) .get(0).scrollIntoView({ block: "nearest" }); - } - }); + }); } function initialize() {