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

[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 0c0be716b4bba5e5c46d1ef0537e9fd422a55eef..24d24f8aef082ec3d17a649ec7c2ad328fcdc1ae 100644 (file)
--- a/app/assets/javascripts/index/note.js
+++ b/app/assets/javascripts/index/note.js
@@ -22,26 +22,27 @@ OSM.Note = function (map) {
 
   page.pushstate = page.popstate = function (path, id) {
     OSM.loadSidebarContent(path, function () {
 
   page.pushstate = page.popstate = function (path, id) {
     OSM.loadSidebarContent(path, function () {

-      initialize(path, id, function () {
-        var data = $(".details").data();
-        if (!data) return;
-        var latLng = L.latLng(data.coordinates.split(","));
-        if (!map.getBounds().contains(latLng)) moveToNote();
-      });
+      initialize(path, id);
+
+      var data = $(".details").data();
+      if (!data) return;
+      var latLng = L.latLng(data.coordinates.split(","));
+      if (!map.getBounds().contains(latLng)) moveToNote();

     });
   };
 
   page.load = function (path, id) {
     });
   };
 
   page.load = function (path, id) {

-    initialize(path, id, moveToNote);
+    initialize(path, id);
+    moveToNote();

   };
 
   };
 

-  function initialize(path, id, callback) {
-    content.find("input[type=submit]").on("click", function (e) {
+  function initialize(path, id) {
+    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,


@@ -50,7 +51,8 @@ OSM.Note = function (map) {
         data: { text: $(form.text).val() },
         success: function () {
           OSM.loadSidebarContent(path, function () {
         data: { text: $(form.text).val() },
         success: function () {
           OSM.loadSidebarContent(path, function () {

-            initialize(path, id, moveToNote);
+            initialize(path, id);
+            moveToNote();

           });
         },
         error: function (xhr) {
           });
         },
         error: function (xhr) {


@@ -78,17 +80,15 @@ OSM.Note = function (map) {
         icon: noteIcons[data.status]
       });
     }
         icon: noteIcons[data.status]
       });
     }

-
-    if (callback) callback();

   }
 
   function updateButtons(form) {
   }
 
   function updateButtons(form) {

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

     if ($(form.text).val() === "") {
     if ($(form.text).val() === "") {

-      $(form.close).val($(form.close).data("defaultActionText"));
+      $(form.close).text($(form.close).data("defaultActionText"));

       $(form.comment).prop("disabled", true);
     } else {
       $(form.comment).prop("disabled", true);
     } else {

-      $(form.close).val($(form.close).data("commentActionText"));
+      $(form.close).text($(form.close).data("commentActionText"));

       $(form.comment).prop("disabled", false);
     }
   }
       $(form.comment).prop("disabled", false);
     }
   }