Merge remote-tracking branch 'openstreetmap/pull/1030' into next

[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 d88ce5d6e2c7fb881bf2810e46e4198cbffe23c1..5223b1420523fd58770177ea66dca42946483d17 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -8,7 +8,6 @@ L.OSM.key = function (options) {
     var button = $('<a>')
       .attr('class', 'control-button')
       .attr('href', '#')
     var button = $('<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);
       .html('<span class="icon key"></span>')
       .on('click', toggle)
       .appendTo($container);


@@ -20,10 +19,9 @@ L.OSM.key = function (options) {
       .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>')
           .bind('click', toggle))
       .append(
         $('<h4>')


@@ -58,11 +56,17 @@ L.OSM.key = function (options) {
       if (!button.hasClass('disabled')) {
         options.sidebar.togglePane($ui, button);
       }
       if (!button.hasClass('disabled')) {
         options.sidebar.togglePane($ui, button);
       }

+      $('.leaflet-control .control-button').tooltip('hide');

     }
 
     function updateButton() {
     }
 
     function updateButton() {

-      var layer = map.getMapBaseLayerId();
-      button.toggleClass('disabled', layer !== 'mapnik');
+      var disabled = ['mapnik', 'cyclemap'].indexOf(map.getMapBaseLayerId()) === -1;
+      button
+        .toggleClass('disabled', disabled)
+        .attr('data-original-title',
+              I18n.t(disabled ?
+                     'javascripts.key.tooltip_disabled' :
+                     'javascripts.key.tooltip'));

     }
 
     function update() {
     }
 
     function update() {


@@ -71,7 +75,7 @@ L.OSM.key = function (options) {
 
       $('.mapkey-table-entry').each(function () {
         var data = $(this).data();
 
       $('.mapkey-table-entry').each(function () {
         var data = $(this).data();

-        if (layer == data.layer && zoom >= data.zoomMin && zoom <= data.zoomMax) {
+        if (layer === data.layer && zoom >= data.zoomMin && zoom <= data.zoomMax) {

           $(this).show();
         } else {
           $(this).hide();
           $(this).show();
         } else {
           $(this).hide();