X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4cf32e0f0043ad73bf8ecd5320ce1ab55e81e386..e7d200c4a6d0904ab1e027518eca7200b0ca9a08:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 77b247c10..238ab7f63 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -24,15 +24,20 @@ $(document).ready(function () { map.hash = L.hash(map); - $(window).on('popstate', function() { - map.hash.update(); + $(window).on('popstate', function(e) { + // popstate is triggered when the hash changes as well as on actual navigation + // events. We want to update the hash on the latter and not the former. + if (e.originalEvent.state) { + map.hash.update(); + } }); var copyright = I18n.t('javascripts.map.copyright', {copyright_url: '/copyright'}); + var donate = I18n.t('javascripts.map.donate_link_text', {donate_url: 'http://donate.openstreetmap.org'}); var layers = [ new L.OSM.Mapnik({ - attribution: copyright, + attribution: copyright+" – "+donate, code: "M", keyid: "mapnik", name: I18n.t("javascripts.map.base.standard") @@ -226,7 +231,7 @@ $(document).ready(function () { initializeNotes(map); OSM.Index = function(map) { - var page = {}, minimized = false; + var page = {}, minimized = $('#sidebar').hasClass('minimized'); page.pushstate = page.popstate = function(path) { if (minimized) $("#sidebar").addClass("minimized"); @@ -239,14 +244,6 @@ $(document).ready(function () { $("#view_tab").removeClass("current"); }; - page.minimizeSidebar = function() { - $("#sidebar").addClass("minimized"); - map.invalidateSize(); - minimized = true; - }; - - $(document).on("click", "#sidebar_content .close", page.minimizeSidebar); - return page; }; @@ -292,7 +289,7 @@ $(document).ready(function () { }); $(document).on("click", "a", function(e) { - if (e.isPropagationStopped()) return; + if (e.isDefaultPrevented() || e.isPropagationStopped()) return; if (this.host === window.location.host && OSM.route(this.pathname + this.search + this.hash)) e.preventDefault(); }); @@ -303,6 +300,10 @@ $(document).ready(function () { $("#describe_location").on("click", function(e) { e.preventDefault(); - OSM.route("/search?query=" + encodeURIComponent(map.getCenter().lat + "," + map.getCenter().lng)); + var precision = zoomPrecision(map.getZoom()); + OSM.route("/search?query=" + encodeURIComponent( + map.getCenter().lat.toFixed(precision) + "," + + map.getCenter().lng.toFixed(precision))); }); + });