Use https to launch the remote editor except for modern browsers

[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 3f71932fbbcdf131f5a9bd95bbe89f7d73d83066..5223b1420523fd58770177ea66dca42946483d17 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -6,7 +6,7 @@ L.OSM.key = function (options) {
       .attr('class', 'control-key');
 
     var button = $('<a>')
-      .attr('class', 'control-button mobile-hide')
+      .attr('class', 'control-button')
       .attr('href', '#')
       .html('<span class="icon key"></span>')
       .on('click', toggle)
@@ -56,15 +56,17 @@ L.OSM.key = function (options) {
       if (!button.hasClass('disabled')) {
         options.sidebar.togglePane($ui, button);
       }
+      $('.leaflet-control .control-button').tooltip('hide');
     }
 
     function updateButton() {
-      var disabled = map.getMapBaseLayerId() !== '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'))
+        .attr('data-original-title',
+              I18n.t(disabled ?
+                     'javascripts.key.tooltip_disabled' :
+                     'javascripts.key.tooltip'));
     }
 
     function update() {
@@ -73,7 +75,7 @@ L.OSM.key = function (options) {
 
       $('.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();