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

[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 9064872740b797888c90fc4520d8dca00321d97f..87f45ce9970aa2a0250038836b1d023f6afae4a5 100644 (file)
--- a/app/assets/javascripts/leaflet.query.js
+++ b/app/assets/javascripts/leaflet.query.js
@@ -2,35 +2,31 @@ L.OSM.query = function (options) {
   var control = L.control(options);
 
   control.onAdd = function (map) {
   var control = L.control(options);
 
   control.onAdd = function (map) {

-    var $container = $('<div>')
-      .attr('class', 'control-query');
+    var $container = $("<div>")
+      .attr("class", "control-query");

 
 

-    var link = $('<a>')
-      .attr('class', 'control-button')
-      .attr('href', '#')
-      .html('<span class="icon query"></span>')
+    var link = $("<a>")
+      .attr("class", "control-button")
+      .attr("href", "#")
+      .html("<span class=\"icon query\"></span>")

       .appendTo($container);
 
       .appendTo($container);
 

-    map.on('zoomend', update);
-
-    update();
+    map.on("zoomend", update);

 
     function update() {
 
     function update() {

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

       link
       link

-        .toggleClass('disabled', isDisabled)
-        .attr('data-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');
-      }
+        .toggleClass("disabled", isDisabled)
+        .attr("data-bs-original-title", I18n.t(isDisabled ?
+          "javascripts.site.queryfeature_disabled_tooltip" :
+          "javascripts.site.queryfeature_tooltip"));
+      if (isDisabled === wasDisabled) return;
+      link.trigger(isDisabled ? "disabled" : "enabled");

     }
 
     }
 

+    update();
+

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