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

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

diff --git a/app/assets/javascripts/leaflet.note.js b/app/assets/javascripts/leaflet.note.js
index 19fc9392c0af65497bf686f8e0c24020cdba3050..e2ca4ffdfda3409580525a33df000b08d1e66c6f 100644 (file)
--- a/app/assets/javascripts/leaflet.note.js
+++ b/app/assets/javascripts/leaflet.note.js
@@ -1,11 +1,11 @@
 L.OSM.note = function (options) {
 L.OSM.note = function (options) {

-  var control = L.control(options);
+  const control = L.control(options);

 
   control.onAdd = function (map) {
 
   control.onAdd = function (map) {

-    var $container = $("<div>")
+    const $container = $("<div>")

       .attr("class", "control-note");
 
       .attr("class", "control-note");
 

-    var link = $("<a>")
+    const link = $("<a>")

       .attr("class", "control-button")
       .attr("href", "#")
       .html("<span class=\"icon note\"></span>")
       .attr("class", "control-button")
       .attr("href", "#")
       .html("<span class=\"icon note\"></span>")


@@ -14,19 +14,15 @@ L.OSM.note = function (options) {
     map.on("zoomend", update);
 
     function update() {
     map.on("zoomend", update);
 
     function update() {

-      var wasDisabled = link.hasClass("disabled"),
-          isDisabled = OSM.STATUS === "database_offline" || map.getZoom() < 12;
+      const wasDisabled = link.hasClass("disabled"),
+            isDisabled = OSM.STATUS === "database_offline" || map.getZoom() < 12;

       link
         .toggleClass("disabled", isDisabled)
         .attr("data-bs-original-title", I18n.t(isDisabled ?
           "javascripts.site.createnote_disabled_tooltip" :
           "javascripts.site.createnote_tooltip"));
       link
         .toggleClass("disabled", isDisabled)
         .attr("data-bs-original-title", I18n.t(isDisabled ?
           "javascripts.site.createnote_disabled_tooltip" :
           "javascripts.site.createnote_tooltip"));

-
-      if (isDisabled && !wasDisabled) {
-        link.trigger("disabled");
-      } else if (wasDisabled && !isDisabled) {
-        link.trigger("enabled");
-      }
+      if (isDisabled === wasDisabled) return;
+      link.trigger(isDisabled ? "disabled" : "enabled");

     }
 
     update();
     }
 
     update();