X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5c0aeb1558a778cd5790be5e062c2df7d9b51da6..8390d1f6c61c1a26051d8685ca1cbd358b221a92:/app/assets/javascripts/leaflet.layers.js diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index 8bcbb701c..a364588c1 100644 --- a/app/assets/javascripts/leaflet.layers.js +++ b/app/assets/javascripts/leaflet.layers.js @@ -7,7 +7,7 @@ L.OSM.layers = function(options) { var $container = $('
') .attr('class', 'control-layers'); - var link = $('') + var button = $('') .attr('class', 'control-button') .attr('href', '#') .attr('title', 'Layers') @@ -18,7 +18,7 @@ L.OSM.layers = function(options) { var $ui = $('
') .attr('class', 'layers-ui'); - $('
') + $('
') .attr('class', 'sidebar_heading') .appendTo($ui) .append( @@ -31,14 +31,10 @@ L.OSM.layers = function(options) { $('

') .text(I18n.t('javascripts.map.layers.header'))); - var baseSection = $('
') - .addClass('base-layers') + var baseSection = $('
') + .attr('class', 'section base-layers') .appendTo($ui); - $('

') - .text(I18n.t('javascripts.map.layers.base')) - .appendTo(baseSection); - list = $('

    ') .appendTo(baseSection); @@ -68,16 +64,20 @@ L.OSM.layers = function(options) { function shown() { miniMap.invalidateSize(); - setView(); - map.on('moveend', setView); + setView({animate: false}); + map.on('moveend', moved); } 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); } }); @@ -109,8 +109,8 @@ L.OSM.layers = function(options) { }); if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') { - var overlaySection = $('
    ') - .addClass('overlay-layers') + var overlaySection = $('
    ') + .attr('class', 'section overlay-layers') .appendTo($ui); $('

    ') @@ -156,7 +156,7 @@ L.OSM.layers = function(options) { function toggle(e) { e.stopPropagation(); e.preventDefault(); - options.sidebar.togglePane($ui); + options.sidebar.togglePane($ui, button); } return $container[0];