Merge pull request #5558 from tomhughes/var-let-const

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

diff --git a/app/assets/javascripts/leaflet.query.js b/app/assets/javascripts/leaflet.query.js
index 00292b74dbfbb3ef6262dd50e949ad50bbc63d32..04176487757aac1b95c2d440e2115ecbfaa2c19f 100644 (file)
--- a/app/assets/javascripts/leaflet.query.js
+++ b/app/assets/javascripts/leaflet.query.js
@@ -1,11 +1,11 @@
 L.OSM.query = function (options) {
 L.OSM.query = 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-query");
 
       .attr("class", "control-query");
 

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

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


@@ -13,24 +13,20 @@ L.OSM.query = function (options) {
 
     map.on("zoomend", update);
 
 
     map.on("zoomend", update);
 

-    update();
-

     function update() {
     function update() {

-      var wasDisabled = link.hasClass("disabled"),
-          isDisabled = map.getZoom() < 14;
+      const wasDisabled = link.hasClass("disabled"),
+            isDisabled = map.getZoom() < 14;

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

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

     }
 
     }
 

+    update();
+

     return $container[0];
   };
 
     return $container[0];
   };