Turn hide/unhide comment controls into buttons

[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 a6213b9c434367a9141062be608e1a2b53d49bf0..23d24d14168ff00a2c42fb16bc8a5201557e0e59 100644 (file)
--- a/app/assets/javascripts/index/changeset.js
+++ b/app/assets/javascripts/index/changeset.js
@@ -30,7 +30,7 @@ OSM.Changeset = function (map) {
     var data;
 
     $(form).find("#comment-error").prop("hidden", true);
-    $(form).find("input[type=submit]").prop("disabled", true);
+    $(form).find("button").prop("disabled", true);
 
     if (include_data) {
       data = { text: $(form.text).val() };
@@ -46,25 +46,20 @@ OSM.Changeset = function (map) {
       success: function () {
         OSM.loadSidebarContent(window.location.pathname, page.load);
       },
-      error: function (xhr, xhr_status, http_status) {
-        $(form).find("#comment-error").text(http_status);
+      error: function (xhr) {
+        $(form).find("#comment-error").text(xhr.responseText);
         $(form).find("#comment-error").prop("hidden", false);
-        $(form).find("input[type=submit]").prop("disabled", false);
+        $(form).find("button").prop("disabled", false);
       }
     });
   }
 
   function initialize() {
-    content.find("input[name=comment]").on("click", function (e) {
+    content.find("button").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) {
-      e.preventDefault();
-      var data = $(e.target).data();
-      updateChangeset(e.target.form, data.method, data.url);
+      var include_data = e.target.name === "comment";
+      updateChangeset(e.target.form, data.method, data.url, include_data);
     });
 
     content.find("textarea").on("input", function (e) {