Even more map ui js refactor

[rails.git] / app / assets / javascripts / index / map_ui.js

diff --git a/app/assets/javascripts/index/map_ui.js b/app/assets/javascripts/index/map_ui.js
index 0f13adcff3ab4c928e7fb08801455c7d170e7d3c..51f00f325335daa7379d08f5b8b866f642ddab96 100644 (file)
--- a/app/assets/javascripts/index/map_ui.js
+++ b/app/assets/javascripts/index/map_ui.js
@@ -7,14 +7,19 @@ OSM.MapUI = L.Control.extend({
     },
 
     _initLayout: function(map) {
-        var className = 'leaflet-control-map-ui',
+        var className = 'control-layers',
             container = this._container = L.DomUtil.create('div', className);
 
-        var link = this._layersLink = L.DomUtil.create('a', 'leaflet-map-ui-layers', container);
+        var link = this._layersLink = L.DomUtil.create('a', 'control-button', container);
+        link.innerHTML = "<span class='icon layers'></span>";
         link.href = '#';
         link.title = 'Layers';
 
         this._uiPane = L.DomUtil.create('div', 'leaflet-map-ui', map._container);
+        L.DomEvent
+            .on(this._uiPane, 'click', L.DomEvent.stopPropagation)
+            .on(this._uiPane, 'click', L.DomEvent.preventDefault)
+            .on(this._uiPane, 'dblclick', L.DomEvent.preventDefault);
 
         $(link).on('click', $.proxy(this.toggleLayers, this));
     },
@@ -23,14 +28,16 @@ OSM.MapUI = L.Control.extend({
         e.stopPropagation();
         e.preventDefault();
 
+        var controlContainer = $('.leaflet-control-container .leaflet-top.leaflet-right');
+
         if ($(this._uiPane).is(':visible')) {
             $(this._uiPane).hide();
-            $(this._container).css({paddingRight: '0'})
+            controlContainer.css({paddingRight: '0'});
         } else {
             $(this._uiPane)
                 .show()
                 .html(JST["templates/map/layers"]());
-            $(this._container).css({paddingRight: '200px'})
+            controlContainer.css({paddingRight: '200px'});
         }
     }
 });