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

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

diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js
index ea236a569e316b99ec87f0e86f6189a75fccfbaf..f89ae0c3d96ff05ae496f8e309c6cd12c2544dfd 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -1,87 +1,51 @@
 L.OSM.key = function (options) {
 L.OSM.key = function (options) {

-  var control = L.control(options);
+  var control = L.OSM.sidebarPane(options, "key", null, "javascripts.key.title");

 
 

-  control.onAdd = function (map) {
-    var $container = $('<div>')
-      .attr('class', 'control-key');
-
-    var button = $('<a>')
-      .attr('class', 'control-button')
-      .attr('href', '#')
-      .html('<span class="icon key"></span>')
-      .on('click', toggle)
-      .appendTo($container);
-
-    var $ui = $('<div>')
-      .attr('class', 'key-ui');
-
-    $('<div>')
-      .attr('class', 'sidebar_heading')
-      .appendTo($ui)
-      .append(
-        $('<span>')
-          .text(I18n.t('javascripts.close'))
-          .attr('class', 'icon close')
-          .bind('click', toggle))
-      .append(
-        $('<h4>')
-          .text(I18n.t('javascripts.key.title')));
-
-    var $section = $('<div>')
-      .attr('class', 'section')
+  control.onAddPane = function (map, button, $ui) {
+    var $section = $("<div>")
+      .attr("class", "p-3")

       .appendTo($ui);
 
       .appendTo($ui);
 

-    options.sidebar.addPane($ui);
-

     $ui
     $ui

-      .on('show', shown)
-      .on('hide', hidden);
+      .on("show", shown)
+      .on("hide", hidden);

 
 

-    map.on('baselayerchange', updateButton);
+    map.on("baselayerchange", updateButton);

 
     updateButton();
 
     function shown() {
 
     updateButton();
 
     function shown() {

-      map.on('zoomend baselayerchange', update);
-      $section.load('/key', update);
+      map.on("zoomend baselayerchange", update);
+      $section.load("/key", update);

     }
 
     function hidden() {
     }
 
     function hidden() {

-      map.off('zoomend baselayerchange', update);
-    }
-
-    function toggle(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      if (!button.hasClass('disabled')) {
-        options.sidebar.togglePane($ui, button);
-      }
+      map.off("zoomend baselayerchange", update);

     }
 
     function updateButton() {
     }
 
     function updateButton() {

-      var disabled = map.getMapBaseLayerId() !== 'mapnik'
+      var disabled = OSM.LAYERS_WITH_MAP_KEY.indexOf(map.getMapBaseLayerId()) === -1;

       button
       button

-        .toggleClass('disabled', disabled)
-        .attr('data-original-title', I18n.t(disabled ?
-          'javascripts.key.tooltip_disabled' :
-          'javascripts.key.tooltip'))
+        .toggleClass("disabled", disabled)
+        .attr("data-bs-original-title",
+              I18n.t(disabled ?
+                "javascripts.key.tooltip_disabled" :
+                "javascripts.key.tooltip"));

     }
 
     function update() {
       var layer = map.getMapBaseLayerId(),
     }
 
     function update() {
       var layer = map.getMapBaseLayerId(),

-        zoom = map.getZoom();
+          zoom = map.getZoom();

 
 

-      $('.mapkey-table-entry').each(function () {
+      $(".mapkey-table-entry").each(function () {

         var data = $(this).data();
         var data = $(this).data();

-        if (layer == data.layer && zoom >= data.zoomMin && zoom <= data.zoomMax) {
-          $(this).show();
-        } else {
-          $(this).hide();
-        }
+        $(this).toggle(
+          layer === data.layer &&
+          (!data.zoomMin || zoom >= data.zoomMin) &&
+          (!data.zoomMax || zoom <= data.zoomMax)
+        );

       });
     }
       });
     }

-
-    return $container[0];

   };
 
   return control;
   };
 
   return control;