Merge remote-tracking branch 'upstream/pull/4262'

[rails.git] / app / assets / javascripts / index / changeset.js

diff --git a/app/assets/javascripts/index/changeset.js b/app/assets/javascripts/index/changeset.js
index 9e38917afeda29892b0ebcfa4df68c172234ceeb..a6213b9c434367a9141062be608e1a2b53d49bf0 100644 (file)
--- a/app/assets/javascripts/index/changeset.js
+++ b/app/assets/javascripts/index/changeset.js
@@ -29,6 +29,7 @@ OSM.Changeset = function (map) {
   function updateChangeset(form, method, url, include_data) {
     var data;
 
   function updateChangeset(form, method, url, include_data) {
     var data;
 

+    $(form).find("#comment-error").prop("hidden", true);

     $(form).find("input[type=submit]").prop("disabled", true);
 
     if (include_data) {
     $(form).find("input[type=submit]").prop("disabled", true);
 
     if (include_data) {


@@ -44,6 +45,11 @@ OSM.Changeset = function (map) {
       data: data,
       success: function () {
         OSM.loadSidebarContent(window.location.pathname, page.load);
       data: data,
       success: function () {
         OSM.loadSidebarContent(window.location.pathname, page.load);

+      },
+      error: function (xhr, xhr_status, http_status) {
+        $(form).find("#comment-error").text(http_status);
+        $(form).find("#comment-error").prop("hidden", false);
+        $(form).find("input[type=submit]").prop("disabled", false);

       }
     });
   }
       }
     });
   }