X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d57dd1f4da4d4605f534607b69944e3c977e4db5..1bee96ede16e1dab41ad82efb9f2486da68a642f:/app/assets/javascripts/index/note.js diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js index 3839d2715..8687321c9 100644 --- a/app/assets/javascripts/index/note.js +++ b/app/assets/javascripts/index/note.js @@ -22,44 +22,50 @@ OSM.Note = function (map) { page.pushstate = page.popstate = function (path, id) { OSM.loadSidebarContent(path, function () { - initialize(path, id, function () { - var data = $(".details").data(); - if (!data) return; - var latLng = L.latLng(data.coordinates.split(",")); - if (!map.getBounds().contains(latLng)) moveToNote(); - }); + initialize(path, id); + + var data = $(".details").data(); + if (!data) return; + var latLng = L.latLng(data.coordinates.split(",")); + if (!map.getBounds().contains(latLng)) moveToNote(); }); }; page.load = function (path, id) { - initialize(path, id, moveToNote); + initialize(path, id); + moveToNote(); }; - function initialize(path, id, callback) { - content.find("button[type=submit]").on("click", function (e) { + function initialize(path, id) { + content.find("button[name]").on("click", function (e) { e.preventDefault(); var data = $(e.target).data(); - var form = e.target.form; - - $(form).find("button[type=submit]").prop("disabled", true); - - $.ajax({ + var name = $(e.target).attr("name"); + var ajaxSettings = { url: data.url, type: data.method, oauth: true, - data: { text: $(form.text).val() }, - success: function () { - OSM.loadSidebarContent(path, function () { - initialize(path, id, moveToNote); + success: () => { + OSM.loadSidebarContent(path, () => { + initialize(path, id); + moveToNote(); }); }, - error: function (xhr) { - $(form).find("#comment-error") + error: (xhr) => { + content.find("#comment-error") .text(xhr.responseText) - .prop("hidden", false); - updateButtons(form); + .prop("hidden", false) + .get(0).scrollIntoView({ block: "nearest" }); + updateButtons(); } - }); + }; + + if (name !== "subscribe" && name !== "unsubscribe" && name !== "reopen") { + ajaxSettings.data = { text: $("textarea").val() }; + } + + content.find("button[name]").prop("disabled", true); + $.ajax(ajaxSettings); }); content.find("textarea").on("input", function (e) { @@ -78,18 +84,18 @@ OSM.Note = function (map) { icon: noteIcons[data.status] }); } - - if (callback) callback(); } - function updateButtons(form) { - $(form).find("button[type=submit]").prop("disabled", false); - if ($(form.text).val() === "") { - $(form.close).text($(form.close).data("defaultActionText")); - $(form.comment).prop("disabled", true); + function updateButtons() { + var resolveButton = content.find("button[name='close']"); + var commentButton = content.find("button[name='comment']"); + + content.find("button[name]").prop("disabled", false); + if (content.find("textarea").val() === "") { + resolveButton.text(resolveButton.data("defaultActionText")); + commentButton.prop("disabled", true); } else { - $(form.close).text($(form.close).data("commentActionText")); - $(form.comment).prop("disabled", false); + resolveButton.text(resolveButton.data("commentActionText")); } }