Merge remote-tracking branch 'upstream/pull/2786'

[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 ea236a569e316b99ec87f0e86f6189a75fccfbaf..e839171ab0937bcede9d8ef3795a552eb5b71842 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -2,78 +2,80 @@ L.OSM.key = function (options) {
   var control = L.control(options);
 
   control.onAdd = function (map) {
   var control = L.control(options);
 
   control.onAdd = function (map) {

-    var $container = $('<div>')
-      .attr('class', 'control-key');
-
-    var button = $('<a>')
-      .attr('class', 'control-button')
-      .attr('href', '#')
-      .html('<span class="icon key"></span>')
-      .on('click', toggle)
+    var $container = $("<div>")
+      .attr("class", "control-key");
+
+    var button = $("<a>")
+      .attr("class", "control-button")
+      .attr("href", "#")
+      .html("<span class=\"icon key\"></span>")
+      .on("click", toggle)

       .appendTo($container);
 
       .appendTo($container);
 

-    var $ui = $('<div>')
-      .attr('class', 'key-ui');
+    var $ui = $("<div>")
+      .attr("class", "key-ui");

 
 

-    $('<div>')
-      .attr('class', 'sidebar_heading')
+    $("<div>")
+      .attr("class", "sidebar_heading")

       .appendTo($ui)
       .append(
       .appendTo($ui)
       .append(

-        $('<span>')
-          .text(I18n.t('javascripts.close'))
-          .attr('class', 'icon close')
-          .bind('click', toggle))
+        $("<span>")
+          .text(I18n.t("javascripts.close"))
+          .attr("class", "icon close")
+          .bind("click", toggle))

       .append(
       .append(

-        $('<h4>')
-          .text(I18n.t('javascripts.key.title')));
+        $("<h4>")
+          .text(I18n.t("javascripts.key.title")));

 
 

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

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

-      .on('show', shown)
-      .on('hide', hidden);
+      .on("show", shown)
+      .on("hide", hidden);

 
 

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

 
     updateButton();
 
     function shown() {
 
     updateButton();
 
     function shown() {

-      map.on('zoomend baselayerchange', update);
-      $section.load('/key', update);
+      map.on("zoomend baselayerchange", update);
+      $section.load("/key", update);

     }
 
     function hidden() {
     }
 
     function hidden() {

-      map.off('zoomend baselayerchange', update);
+      map.off("zoomend baselayerchange", update);

     }
 
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();
     }
 
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();

-      if (!button.hasClass('disabled')) {
+      if (!button.hasClass("disabled")) {

         options.sidebar.togglePane($ui, button);
       }
         options.sidebar.togglePane($ui, button);
       }

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

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

-      var disabled = map.getMapBaseLayerId() !== 'mapnik'
+      var disabled = ["mapnik", "cyclemap"].indexOf(map.getMapBaseLayerId()) === -1;

       button
       button

-        .toggleClass('disabled', disabled)
-        .attr('data-original-title', I18n.t(disabled ?
-          'javascripts.key.tooltip_disabled' :
-          'javascripts.key.tooltip'))
+        .toggleClass("disabled", disabled)
+        .attr("data-original-title",
+              I18n.t(disabled ?
+                "javascripts.key.tooltip_disabled" :
+                "javascripts.key.tooltip"));

     }
 
     function update() {
       var layer = map.getMapBaseLayerId(),
     }
 
     function update() {
       var layer = map.getMapBaseLayerId(),

-        zoom = map.getZoom();
+          zoom = map.getZoom();

 
 

-      $('.mapkey-table-entry').each(function () {
+      $(".mapkey-table-entry").each(function () {

         var data = $(this).data();
         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();