X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0a040c7a79512ceb1120b88723a6a5ac146ef1c5..040804335d799bdcdff6005893c85daac3203f00:/app/assets/javascripts/index.js?ds=sidebyside diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 1f68c93cb..5cc3a25b8 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -37,13 +37,7 @@ $(document).ready(function () { var layers = [ new L.OSM.Mapnik({ - attribution: donate, - code: "M", - keyid: "mapnik", - name: I18n.t("javascripts.map.base.standard") - }), - new L.OSM.Mapnik({ - attribution: copyright, + attribution: copyright + " ♥ " + donate, code: "M", keyid: "mapnik", name: I18n.t("javascripts.map.base.standard") @@ -237,27 +231,14 @@ $(document).ready(function () { initializeNotes(map); OSM.Index = function(map) { - var page = {}, minimized = false; + var page = {}; page.pushstate = page.popstate = function(path) { - if (minimized) $("#sidebar").addClass("minimized"); - map.invalidateSize(); - $("#view_tab").addClass("current"); - $('#sidebar_content').load(path); - }; - - page.unload = function() { - $("#view_tab").removeClass("current"); - }; - - page.minimizeSidebar = function() { $("#sidebar").addClass("minimized"); map.invalidateSize(); - minimized = true; + $('#sidebar_content').load(path); }; - $(document).on("click", "#sidebar_content .close", page.minimizeSidebar); - return page; }; @@ -273,6 +254,8 @@ $(document).ready(function () { }; page.load = function(path, type, id) { + $("#sidebar").removeClass("minimized"); + if (OSM.STATUS === 'api_offline' || OSM.STATUS === 'database_offline') return; if (type === 'note') { @@ -320,4 +303,16 @@ $(document).ready(function () { map.getCenter().lng.toFixed(precision))); }); + function removeSidebar() { + if ($(window).width() < 721) { + $('#sidebar').addClass("minimized"); + } + } + + $(window).resize(function() { + removeSidebar(); + }); + + removeSidebar(); + });