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

[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 8188b8aee01cef1d57623c4513e0b054f9178255..4fb512bdd81028eeaf6de4c6920a52e48856ab14 100644 (file)
--- a/app/assets/javascripts/index/note.js
+++ b/app/assets/javascripts/index/note.js
@@ -22,73 +22,84 @@ 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(),
-            latLng = L.latLng(data.coordinates.split(","));
-        if (!map.getBounds().contains(latLng)) moveToNote();
-      });
+      var data = $(".details").data();
+      if (!data) return;
+      var latLng = L.latLng(data.coordinates.split(","));
+      initialize(path, id, map.getBounds().contains(latLng));

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

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

   };
 
   };
 

-  function initialize(path, id, callback) {
-    content.find("input[type=submit]").on("click", function (e) {
+  function initialize(path, id, skipMoveToNote) {
+    content.find("button[name]").on("click", function (e) {

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

-      var form = e.target.form;
-
-      $(form).find("input[type=submit]").prop("disabled", true);
-
-      $.ajax({
+      var name = $(e.target).attr("name");
+      var ajaxSettings = {

         url: data.url,
         type: data.method,
         oauth: true,
         url: data.url,
         type: data.method,
         oauth: true,

-        data: { text: $(form.text).val() },
-        success: function () {
-          OSM.loadSidebarContent(path, function () {
-            initialize(path, id, moveToNote);
+        success: () => {
+          OSM.loadSidebarContent(path, () => {
+            initialize(path, id, false);

           });
           });

+        },
+        error: (xhr) => {
+          content.find("#comment-error")
+            .text(xhr.responseText)
+            .prop("hidden", false)
+            .get(0).scrollIntoView({ block: "nearest" });
+          updateButtons();

         }
         }

-      });
+      };
+
+      if (name !== "subscribe" && name !== "unsubscribe" && name !== "reopen") {
+        ajaxSettings.data = { text: content.find("textarea").val() };
+      }
+
+      content.find("button[name]").prop("disabled", true);
+      $.ajax(ajaxSettings);

     });
 
     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(I18n.t("javascripts.notes.show.resolve"));
-        $(form.comment).prop("disabled", true);
-      } else {
-        $(form.close).val(I18n.t("javascripts.notes.show.comment_and_resolve"));
-        $(form.comment).prop("disabled", false);
-      }
+      updateButtons(e.target.form);

     });
 
     content.find("textarea").val("").trigger("input");
 
     var data = $(".details").data();
 
     });
 
     content.find("textarea").val("").trigger("input");
 
     var data = $(".details").data();
 

-    map.addObject({
-      type: "note",
-      id: parseInt(id, 10),
-      latLng: L.latLng(data.coordinates.split(",")),
-      icon: noteIcons[data.status]
-    });
-
-    if (callback) callback();
+    if (data) {
+      var hashParams = OSM.parseHash(window.location.hash);
+      map.addObject({
+        type: "note",
+        id: parseInt(id, 10),
+        latLng: L.latLng(data.coordinates.split(",")),
+        icon: noteIcons[data.status]
+      }, function () {
+        if (!hashParams.center && !skipMoveToNote) {
+          var latLng = L.latLng(data.coordinates.split(","));
+          OSM.router.withoutMoveListener(function () {
+            map.setView(latLng, 15, { reset: true });
+          });
+        }
+      });
+    }

   }
 
   }
 

-  function moveToNote() {
-    var data = $(".details").data(),
-        latLng = L.latLng(data.coordinates.split(","));
+  function updateButtons() {
+    var resolveButton = content.find("button[name='close']");
+    var commentButton = content.find("button[name='comment']");

 
 

-    if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
-      OSM.router.withoutMoveListener(function () {
-        map.setView(latLng, 15, { reset: true });
-      });
+    content.find("button[name]").prop("disabled", false);
+    if (content.find("textarea").val() === "") {
+      resolveButton.text(resolveButton.data("defaultActionText"));
+      commentButton.prop("disabled", true);
+    } else {
+      resolveButton.text(resolveButton.data("commentActionText"));

     }
   }
 
     }
   }