X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/33b7903c799c4f945e1b0e708587b70360cb0e74..e68e3e9150c1e02063664afcf8f6028903c59cb4:/app/assets/javascripts/leaflet.layers.js?ds=inline diff --git a/app/assets/javascripts/leaflet.layers.js b/app/assets/javascripts/leaflet.layers.js index e8014ac47..fd493ee32 100644 --- 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 = $('
') .attr('class', 'control-layers'); - var link = $('') + var button = $('') .attr('class', 'control-button') .attr('href', '#') - .attr('title', 'Layers') + .attr('title', I18n.t('javascripts.map.layers.title')) .html('') .on('click', toggle) .appendTo($container); @@ -22,10 +22,9 @@ L.OSM.layers = function(options) { .attr('class', 'sidebar_heading') .appendTo($ui) .append( - $('') + $('') .text(I18n.t('javascripts.close')) - .attr('class', 'sidebar_close') - .attr('href', '#') + .attr('class', 'icon close') .bind('click', toggle)) .append( $('

') @@ -64,16 +63,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); } }); @@ -81,9 +84,9 @@ L.OSM.layers = function(options) { .appendTo(item); var 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); @@ -111,6 +114,7 @@ L.OSM.layers = function(options) { $('

') .text(I18n.t('javascripts.map.layers.overlays')) + .attr("class", "deemphasize") .appendTo(overlaySection); var list = $('

    ') @@ -152,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];