Simplify close icon for routing panel and fix validation error

[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 9fe457851f35dad9ed907a36a1fe65bb44875e19..68e822e7f3504409d41380abc9b9be2af159325d 100644 (file)
--- a/app/assets/javascripts/leaflet.key.js
+++ b/app/assets/javascripts/leaflet.key.js
@@ -5,22 +5,30 @@ 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');
+      .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);
 
     options.sidebar.addPane($ui);
       .appendTo($ui);
 
     options.sidebar.addPane($ui);


@@ -29,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);


@@ -41,16 +53,29 @@ 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() {

-      var layer = getMapBaseLayerId(map),
+      var layer = map.getMapBaseLayerId(),

         zoom = map.getZoom();
 
       $('.mapkey-table-entry').each(function () {
         var data = $(this).data();
         zoom = map.getZoom();
 
       $('.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();