X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/501d13e1c0936cc3ba3d9639620517bae34e5784..f9ea6aa718a5babc16bb5195098b504a1bd43e32:/app/assets/javascripts/index/changeset.js diff --git a/app/assets/javascripts/index/changeset.js b/app/assets/javascripts/index/changeset.js index 57d98dc24..75a1f7b4d 100644 --- a/app/assets/javascripts/index/changeset.js +++ b/app/assets/javascripts/index/changeset.js @@ -1,23 +1,22 @@ OSM.Changeset = function (map) { var page = {}, - content = $('#sidebar_content'), - currentChangesetId; + content = $("#sidebar_content"), + currentChangesetId; - page.pushstate = page.popstate = function(path, id) { - OSM.loadSidebarContent(path, function() { + page.pushstate = page.popstate = function (path, id) { + OSM.loadSidebarContent(path, function () { page.load(path, id); }); }; - page.load = function(path, id) { - if(id) - currentChangesetId = id; + page.load = function (path, id) { + if (id) currentChangesetId = id; initialize(); addChangeset(currentChangesetId, true); }; function addChangeset(id, center) { - var bounds = map.addObject({type: 'changeset', id: parseInt(id)}, function(bounds) { + map.addObject({ type: "changeset", id: parseInt(id, 10) }, function (bounds) { if (!window.location.hash && bounds.isValid() && (center || !map.getBounds().contains(bounds))) { OSM.router.withoutMoveListener(function () { @@ -27,10 +26,14 @@ OSM.Changeset = function (map) { }); } - function updateChangeset(form, method, url, include_data) { - $(form).find("input[type=submit]").prop("disabled", true); - if(include_data) { - data = {text: $(form.text).val()}; + function updateChangeset(method, url, include_data) { + var data; + + 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 = {}; } @@ -42,39 +45,41 @@ OSM.Changeset = function (map) { data: data, success: function () { OSM.loadSidebarContent(window.location.pathname, page.load); + }, + error: function (xhr) { + content.find("button[data-method][data-url]").prop("disabled", false); + content.find("#comment-error") + .text(xhr.responseText) + .prop("hidden", false) + .get(0).scrollIntoView({ block: "nearest" }); } }); } function initialize() { - content.find("input[name=comment]").on("click", function (e) { - e.preventDefault(); - var data = $(e.target).data(); - updateChangeset(e.target.form, data.method, data.url, true); - }); - - content.find(".action-button").on("click", function (e) { + content.find("button[data-method][data-url]").on("click", function (e) { e.preventDefault(); var data = $(e.target).data(); - updateChangeset(e.target.form, data.method, data.url); + var include_data = e.target.name === "comment"; + updateChangeset(data.method, data.url, include_data); }); content.find("textarea").on("input", function (e) { var form = e.target.form; - if ($(e.target).val() == "") { + if ($(e.target).val() === "") { $(form.comment).prop("disabled", true); } else { $(form.comment).prop("disabled", false); } }); - content.find("textarea").val('').trigger("input"); - }; + content.find("textarea").val("").trigger("input"); + } - page.unload = function() { + page.unload = function () { map.removeObject(); }; return page; -}; \ No newline at end of file +};