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 d12187bc2f80581ba5f42d9120c3f0abee31bcf3..58bfbf6d2aa07644d98585240f1b9d948883c946 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -5,10 +5,9 @@ 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);
       .html('<span class="icon key"></span>')
       .on('click', toggle)
       .appendTo($container);


@@ -16,20 +15,20 @@ L.OSM.key = function (options) {
     var $ui = $('<div>')
       .attr('class', 'key-ui');
 
     var $ui = $('<div>')
       .attr('class', 'key-ui');
 

-    $('<header>')
+    $('<div>')

       .attr('class', 'sidebar_heading')
       .appendTo($ui)
       .append(
       .attr('class', 'sidebar_heading')
       .appendTo($ui)
       .append(

-        $('<a>')
+        $('<span>')

           .text(I18n.t('javascripts.close'))
           .text(I18n.t('javascripts.close'))

-          .attr('class', 'sidebar_close')
-          .attr('href', '#')
+          .attr('class', 'icon close')

           .bind('click', toggle))
       .append(
         $('<h4>')
           .text(I18n.t('javascripts.key.title')));
 
           .bind('click', toggle))
       .append(
         $('<h4>')
           .text(I18n.t('javascripts.key.title')));
 

-    var $section = $('<section>')
+    var $section = $('<div>')
+      .attr('class', 'section')

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


@@ -38,6 +37,10 @@ L.OSM.key = function (options) {
       .on('show', shown)
       .on('hide', hidden);
 
       .on('show', shown)
       .on('hide', hidden);
 

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

     function shown() {
       map.on('zoomend baselayerchange', update);
       $section.load('/key', update);
     function shown() {
       map.on('zoomend baselayerchange', update);
       $section.load('/key', update);


@@ -50,7 +53,19 @@ L.OSM.key = function (options) {
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();

-      options.sidebar.togglePane($ui);
+      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() {