X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c8f8dbca19f9f1ed3539f93e1785d4de70f2b093..1debc147b8c4d9c917d54a279dcf0e2718e0665e:/app/assets/javascripts/leaflet.key.js

diff --git a/app/assets/javascripts/leaflet.key.js b/app/assets/javascripts/leaflet.key.js
index 4906cfcff..5aae3d1c2 100644
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -8,48 +8,57 @@ L.OSM.key = function (options) {
     $('<a>')
       .attr('class', 'control-button')
       .attr('href', '#')
-      .attr('title', I18n.t("javascripts.key.tooltip"))
+      .attr('title', I18n.t('javascripts.key.tooltip'))
       .html('<span class="icon key"></span>')
       .on('click', toggle)
       .appendTo($container);
 
     var $ui = $('<div>')
-      .attr('class', 'layers-ui')
-      .appendTo(options.uiPane);
+      .attr('class', 'layers-ui');
 
-    $('<h2>')
-      .text(I18n.t('javascripts.key.title'))
-      .appendTo($ui);
+    $('<section>')
+      .appendTo($ui)
+      .append(
+          $('<a>')
+            .html('&raquo;')
+            .attr('class', 'close-button')
+            .attr('href', '#')
+            .bind('click', toggle))
+      .append(
+      $('<h2>')
+        .text(I18n.t('javascripts.key.title')));
 
     var $section = $('<section>')
       .appendTo($ui);
 
+    options.sidebar.addPane($ui);
+
+    $ui
+      .on('show', shown)
+      .on('hide', hidden);
+
+    function shown() {
+      map.on('zoomend baselayerchange', update);
+      $section.load('/key', update);
+    }
+
+    function hidden() {
+      map.off('zoomend baselayerchange', update);
+    }
+
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();
-
-      var controlContainer = $('.leaflet-control-container .leaflet-top.leaflet-right');
-
-      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);
-      }
+      options.sidebar.togglePane($ui);
     }
 
     function update() {
-      var mapLayer = getMapBaseLayerId(map),
-        mapZoom = map.getZoom();
+      var layer = map.getMapBaseLayerId(),
+        zoom = map.getZoom();
 
-      $(".mapkey-table-entry").each(function () {
+      $('.mapkey-table-entry').each(function () {
         var data = $(this).data();
-
-        if (mapLayer == data.layer && mapZoom >= data.zoomMin && mapZoom <= data.zoomMax) {
+        if (layer == data.layer && zoom >= data.zoomMin && zoom <= data.zoomMax) {
           $(this).show();
         } else {
           $(this).hide();