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

[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 3839d2715d731121cc90308134e9724e5ced246e..b9310a1af9e159d159dcef7254988d8623dc3983 100644 (file)
--- a/app/assets/javascripts/index/note.js
+++ b/app/assets/javascripts/index/note.js
@@ -1,8 +1,8 @@
 OSM.Note = function (map) {
 OSM.Note = function (map) {

-  var content = $("#sidebar_content"),
-      page = {};
+  const content = $("#sidebar_content"),
+        page = {};

 
 

-  var noteIcons = {
+  const noteIcons = {

     "new": L.icon({
       iconUrl: OSM.NEW_NOTE_MARKER,
       iconSize: [25, 40],
     "new": L.icon({
       iconUrl: OSM.NEW_NOTE_MARKER,
       iconSize: [25, 40],


@@ -22,44 +22,52 @@ 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();
-      });
+      const data = $(".details").data();
+      if (!data) return;
+      const 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("button[type=submit]").on("click", function (e) {
+  function initialize(path, id, skipMoveToNote) {
+    content.find("button[name]").on("click", function (e) {

       e.preventDefault();
       e.preventDefault();

-      var data = $(e.target).data();
-      var form = e.target.form;
-
-      $(form).find("button[type=submit]").prop("disabled", true);
-
-      $.ajax({
-        url: data.url,
-        type: data.method,
-        oauth: true,
-        data: { text: $(form.text).val() },
-        success: function () {
-          OSM.loadSidebarContent(path, function () {
-            initialize(path, id, moveToNote);
+      const { url, method } = $(e.target).data(),
+            name = $(e.target).attr("name"),
+            data = new URLSearchParams();
+      content.find("button[name]").prop("disabled", true);
+
+      if (name !== "subscribe" && name !== "unsubscribe" && name !== "reopen") {
+        data.set("text", content.find("textarea").val());
+      }
+
+      fetch(url, {
+        method: method,
+        headers: { ...OSM.oauth },
+        body: data
+      })
+        .then(response => {
+          if (response.ok) return response;
+          return response.text().then(text => {
+            throw new Error(text);

           });
           });

-        },
-        error: function (xhr) {
-          $(form).find("#comment-error")
-            .text(xhr.responseText)
-            .prop("hidden", false);
-          updateButtons(form);
-        }
-      });
+        })
+        .then(() => {
+          OSM.loadSidebarContent(path, () => {
+            initialize(path, id, false);
+          });
+        })
+        .catch(error => {
+          content.find("#comment-error")
+            .text(error.message)
+            .prop("hidden", false)
+            .get(0).scrollIntoView({ block: "nearest" });
+          updateButtons();
+        });

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


@@ -68,40 +76,36 @@ OSM.Note = function (map) {
 
     content.find("textarea").val("").trigger("input");
 
 
     content.find("textarea").val("").trigger("input");
 

-    var data = $(".details").data();
+    const data = $(".details").data();

 
     if (data) {
 
     if (data) {

+      const hashParams = OSM.parseHash(window.location.hash);

       map.addObject({
         type: "note",
         id: parseInt(id, 10),
         latLng: L.latLng(data.coordinates.split(",")),
         icon: noteIcons[data.status]
       map.addObject({
         type: "note",
         id: parseInt(id, 10),
         latLng: L.latLng(data.coordinates.split(",")),
         icon: noteIcons[data.status]

+      }, function () {
+        if (!hashParams.center && !skipMoveToNote) {
+          const latLng = L.latLng(data.coordinates.split(","));
+          OSM.router.withoutMoveListener(function () {
+            map.setView(latLng, 15, { reset: true });
+          });
+        }

       });
     }
       });
     }

-
-    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 updateButtons() {
+    const resolveButton = content.find("button[name='close']");
+    const commentButton = content.find("button[name='comment']");

 
 

-  function moveToNote() {
-    var data = $(".details").data();
-    if (!data) return;
-    var latLng = L.latLng(data.coordinates.split(","));
-
-    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"));

     }
   }
 
     }
   }