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

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

diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js
index e7790c904b111804f7332b46cc7a81bffcee654e..3839d2715d731121cc90308134e9724e5ced246e 100644 (file)
--- a/app/assets/javascripts/index/note.js
+++ b/app/assets/javascripts/index/note.js
@@ -36,12 +36,12 @@ OSM.Note = function (map) {
   };
 
   function initialize(path, id, callback) {
   };
 
   function initialize(path, id, callback) {

-    content.find("input[type=submit]").on("click", function (e) {
+    content.find("button[type=submit]").on("click", function (e) {

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

-      $(form).find("input[type=submit]").prop("disabled", true);
+      $(form).find("button[type=submit]").prop("disabled", true);

 
       $.ajax({
         url: data.url,
 
       $.ajax({
         url: data.url,


@@ -52,20 +52,18 @@ OSM.Note = function (map) {
           OSM.loadSidebarContent(path, function () {
             initialize(path, id, moveToNote);
           });
           OSM.loadSidebarContent(path, function () {
             initialize(path, id, moveToNote);
           });

+        },
+        error: function (xhr) {
+          $(form).find("#comment-error")
+            .text(xhr.responseText)
+            .prop("hidden", false);
+          updateButtons(form);

         }
       });
     });
 
     content.find("textarea").on("input", function (e) {
         }
       });
     });
 
     content.find("textarea").on("input", function (e) {

-      var form = e.target.form;
-
-      if ($(e.target).val() === "") {
-        $(form.close).val($(form.close).data("defaultActionText"));
-        $(form.comment).prop("disabled", true);
-      } else {
-        $(form.close).val($(form.close).data("commentActionText"));
-        $(form.comment).prop("disabled", false);
-      }
+      updateButtons(e.target.form);

     });
 
     content.find("textarea").val("").trigger("input");
     });
 
     content.find("textarea").val("").trigger("input");


@@ -84,6 +82,17 @@ OSM.Note = function (map) {
     if (callback) callback();
   }
 
     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);
+    } else {
+      $(form.close).text($(form.close).data("commentActionText"));
+      $(form.comment).prop("disabled", false);
+    }
+  }
+

   function moveToNote() {
     var data = $(".details").data();
     if (!data) return;
   function moveToNote() {
     var data = $(".details").data();
     if (!data) return;