X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/89095c898116d8c4b314c1316557a86a781ba7f7..e8f2af833ac73f953cb65d06b8861c0f9844e852:/app/assets/javascripts/leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index 676cd9607..f372b86cf 100644
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -1,34 +1,9 @@
 L.OSM.layers = function (options) {
-  var control = L.control(options);
+  var control = L.OSM.sidebarPane(options, "layers", "javascripts.map.layers.title", "javascripts.map.layers.header");
 
-  control.onAdd = function (map) {
+  control.onAddPane = function (map, button, $ui, toggle) {
     var layers = options.layers;
 
-    var $container = $("<div>")
-      .attr("class", "control-layers");
-
-    var button = $("<a>")
-      .attr("class", "control-button")
-      .attr("href", "#")
-      .attr("title", I18n.t("javascripts.map.layers.title"))
-      .html("<span class=\"icon layers\"></span>")
-      .on("click", toggle)
-      .appendTo($container);
-
-    var $ui = $("<div>")
-      .attr("class", "layers-ui");
-
-    $("<div>")
-      .attr("class", "sidebar_heading")
-      .appendTo($ui)
-      .append(
-        $("<button type='button' class='btn-close float-end mt-1'>")
-          .attr("aria-label", I18n.t("javascripts.close"))
-          .bind("click", toggle))
-      .append(
-        $("<h4>")
-          .text(I18n.t("javascripts.map.layers.header")));
-
     var baseSection = $("<div>")
       .attr("class", "section base-layers")
       .appendTo($ui);
@@ -123,11 +98,15 @@ L.OSM.layers = function (options) {
 
       var addOverlay = function (layer, name, maxArea) {
         var item = $("<li>")
-          .tooltip({
-            placement: "top"
-          })
           .appendTo(overlays);
 
+        var tooltip;
+        if (name === "notes" || name === "data") {
+          item.attr("title", I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip"));
+          tooltip = new bootstrap.Tooltip(item[0]);
+          tooltip.disable();
+        }
+
         var label = $("<label>")
           .attr("class", "form-check-label")
           .appendTo(item);
@@ -170,8 +149,13 @@ L.OSM.layers = function (options) {
           }
 
           $(item).attr("class", disabled ? "disabled" : "");
-          item.attr("data-original-title", disabled ?
-            I18n.t("javascripts.site.map_" + name + "_zoom_in_tooltip") : "");
+          if (tooltip) {
+            if (disabled) {
+              tooltip.enable();
+            } else {
+              tooltip.disable();
+            }
+          }
         });
       };
 
@@ -179,17 +163,6 @@ L.OSM.layers = function (options) {
       addOverlay(map.dataLayer, "data", OSM.MAX_REQUEST_AREA);
       addOverlay(map.gpsLayer, "gps", Number.POSITIVE_INFINITY);
     }
-
-    options.sidebar.addPane($ui);
-
-    function toggle(e) {
-      e.stopPropagation();
-      e.preventDefault();
-      options.sidebar.togglePane($ui, button);
-      $(".leaflet-control .control-button").tooltip("hide");
-    }
-
-    return $container[0];
   };
 
   return control;