Don't send comment text when reopening a note

[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 4906cfcff67d8ae874c1e2fc5f92d027289ebfeb..f89ae0c3d96ff05ae496f8e309c6cd12c2544dfd 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -1,63 +1,51 @@
 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');
-
-    $('<a>')
-      .attr('class', 'control-button')
-      .attr('href', '#')
-      .attr('title', I18n.t("javascripts.key.tooltip"))
-      .html('<span class="icon key"></span>')
-      .on('click', toggle)
-      .appendTo($container);
+  control.onAddPane = function (map, button, $ui) {
+    var $section = $("<div>")
+      .attr("class", "p-3")
+      .appendTo($ui);
 
-    var $ui = $('<div>')
-      .attr('class', 'layers-ui')
-      .appendTo(options.uiPane);
+    $ui
+      .on("show", shown)
+      .on("hide", hidden);
 
-    $('<h2>')
-      .text(I18n.t('javascripts.key.title'))
-      .appendTo($ui);
+    map.on("baselayerchange", updateButton);
 
-    var $section = $('<section>')
-      .appendTo($ui);
+    updateButton();
 
-    function toggle(e) {
-      e.stopPropagation();
-      e.preventDefault();
+    function shown() {
+      map.on("zoomend baselayerchange", update);
+      $section.load("/key", update);
+    }
 
-      var controlContainer = $('.leaflet-control-container .leaflet-top.leaflet-right');
+    function hidden() {
+      map.off("zoomend baselayerchange", update);
+    }
 
-      if ($ui.is(':visible')) {
-        $(options.uiPane).hide();
-        controlContainer.css({paddingRight: '0'});
-        map.off("zoomend baselayerchange", update);
-      } else {
-        $(options.uiPane).show();
-        controlContainer.css({paddingRight: '200px'});
-        map.on("zoomend baselayerchange", update);
-        $section.load('/key', update);
-      }
+    function updateButton() {
+      var disabled = OSM.LAYERS_WITH_MAP_KEY.indexOf(map.getMapBaseLayerId()) === -1;
+      button
+        .toggleClass("disabled", disabled)
+        .attr("data-bs-original-title",
+              I18n.t(disabled ?
+                "javascripts.key.tooltip_disabled" :
+                "javascripts.key.tooltip"));
     }
 
     function update() {
-      var mapLayer = getMapBaseLayerId(map),
-        mapZoom = map.getZoom();
+      var layer = map.getMapBaseLayerId(),
+          zoom = map.getZoom();
 
       $(".mapkey-table-entry").each(function () {
         var data = $(this).data();
-
-        if (mapLayer == data.layer && mapZoom >= data.zoomMin && mapZoom <= 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;