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

[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..75a1f7b4dfa770463867cf7fafafbaf05babb1e3 100644 (file)
--- a/app/assets/javascripts/index/changeset.js
+++ b/app/assets/javascripts/index/changeset.js
@@ -26,13 +26,14 @@ OSM.Changeset = function (map) {
     });
   }
 
     });
   }
 

-  function updateChangeset(form, method, url, include_data) {
+  function updateChangeset(method, url, include_data) {

     var data;
 
     var data;
 

-    $(form).find("input[type=submit]").prop("disabled", true);
+    content.find("#comment-error").prop("hidden", true);
+    content.find("button[data-method][data-url]").prop("disabled", true);

 
     if (include_data) {
 
     if (include_data) {

-      data = { text: $(form.text).val() };
+      data = { text: content.find("textarea").val() };

     } else {
       data = {};
     }
     } else {
       data = {};
     }


@@ -44,21 +45,23 @@ 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) {
+        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() {
       }
     });
   }
 
   function initialize() {

-    content.find("input[name=comment]").on("click", function (e) {
+    content.find("button[data-method][data-url]").on("click", function (e) {

       e.preventDefault();
       var data = $(e.target).data();
       e.preventDefault();
       var data = $(e.target).data();

-      updateChangeset(e.target.form, data.method, data.url, true);
-    });
-
-    content.find(".action-button").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) {
     });
 
     content.find("textarea").on("input", function (e) {