Add notes sidebar interaction

[rails.git] / app / assets / javascripts / leaflet.layers.js

diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js
index e8014ac4794d2836b1aa30f6135625ce49c545e5..fd493ee32c212d882b38bd6948ef07861c26cd55 100644 (file)
--- a/app/assets/javascripts/leaflet.layers.js
+++ b/app/assets/javascripts/leaflet.layers.js
@@ -7,10 +7,10 @@ L.OSM.layers = function(options) {
     var $container = $('<div>')
       .attr('class', 'control-layers');
 
     var $container = $('<div>')
       .attr('class', 'control-layers');
 

-    var link = $('<a>')
+    var button = $('<a>')

       .attr('class', 'control-button')
       .attr('href', '#')
       .attr('class', 'control-button')
       .attr('href', '#')

-      .attr('title', 'Layers')
+      .attr('title', I18n.t('javascripts.map.layers.title'))

       .html('<span class="icon layers"></span>')
       .on('click', toggle)
       .appendTo($container);
       .html('<span class="icon layers"></span>')
       .on('click', toggle)
       .appendTo($container);


@@ -22,10 +22,9 @@ L.OSM.layers = 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>')


@@ -64,16 +63,20 @@ L.OSM.layers = function(options) {
 
         function shown() {
           miniMap.invalidateSize();
 
         function shown() {
           miniMap.invalidateSize();

-          setView();
-          map.on('moveend', setView);
+          setView({animate: false});
+          map.on('moveend', moved);

         }
 
         function hide() {
         }
 
         function hide() {

-          map.off('moveend', setView);
+          map.off('moveend', moved);
+        }
+
+        function moved() {
+          setView();

         }
 
         }
 

-        function setView() {
-          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0));
+        function setView(options) {
+          miniMap.setView(map.getCenter(), Math.max(map.getZoom() - 2, 0), options);

         }
       });
 
         }
       });
 


@@ -81,9 +84,9 @@ L.OSM.layers = function(options) {
         .appendTo(item);
 
       var input = $('<input>')
         .appendTo(item);
 
       var input = $('<input>')

-        .attr('type', 'radio')
-        .prop('checked', map.hasLayer(layer))
-        .appendTo(label);
+         .attr('type', 'radio')
+         .prop('checked', map.hasLayer(layer))
+         .appendTo(label);

 
       label.append(layer.options.name);
 
 
       label.append(layer.options.name);
 


@@ -111,6 +114,7 @@ L.OSM.layers = function(options) {
 
       $('<p>')
         .text(I18n.t('javascripts.map.layers.overlays'))
 
       $('<p>')
         .text(I18n.t('javascripts.map.layers.overlays'))

+        .attr("class", "deemphasize")

         .appendTo(overlaySection);
 
       var list = $('<ul>')
         .appendTo(overlaySection);
 
       var list = $('<ul>')


@@ -152,7 +156,7 @@ L.OSM.layers = function(options) {
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();
     function toggle(e) {
       e.stopPropagation();
       e.preventDefault();

-      options.sidebar.togglePane($ui);
+      options.sidebar.togglePane($ui, button);

     }
 
     return $container[0];
     }
 
     return $container[0];