Don't pass the hash when routing an empty search query

[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..58bfbf6d2aa07644d98585240f1b9d948883c946 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -5,51 +5,76 @@ L.OSM.key = function (options) {
     var $container = $('<div>')
       .attr('class', 'control-key');
 
     var $container = $('<div>')
       .attr('class', 'control-key');
 

-    $('<a>')
+    var button = $('<a>')

       .attr('class', 'control-button')
       .attr('href', '#')
       .attr('class', 'control-button')
       .attr('href', '#')

-      .attr('title', I18n.t("javascripts.key.tooltip"))

       .html('<span class="icon key"></span>')
       .on('click', toggle)
       .appendTo($container);
 
     var $ui = $('<div>')
       .html('<span class="icon key"></span>')
       .on('click', toggle)
       .appendTo($container);
 
     var $ui = $('<div>')

-      .attr('class', 'layers-ui')
-      .appendTo(options.uiPane);
+      .attr('class', 'key-ui');

 
 

-    $('<h2>')
-      .text(I18n.t('javascripts.key.title'))
-      .appendTo($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 = $('<section>')
+    var $section = $('<div>')
+      .attr('class', 'section')

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

+    options.sidebar.addPane($ui);
+
+    $ui
+      .on('show', shown)
+      .on('hide', hidden);
+
+    map.on('baselayerchange', updateButton);
+
+    updateButton();
+
+    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();
     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);
+      if (!button.hasClass('disabled')) {
+        options.sidebar.togglePane($ui, button);

       }
       }

+      $('.leaflet-control .control-button').tooltip('hide');
+    }
+
+    function updateButton() {
+      var disabled = map.getMapBaseLayerId() !== 'mapnik'
+      button
+        .toggleClass('disabled', disabled)
+        .attr('data-original-title', I18n.t(disabled ?
+          'javascripts.key.tooltip_disabled' :
+          'javascripts.key.tooltip'))

     }
 
     function update() {
     }
 
     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();
         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();
           $(this).show();
         } else {
           $(this).hide();