cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sidebar close reverts to 'view' state

Browse source
This commit is contained in:
Aaron Lidman 2013-11-06 16:59:14 -08:00
parent 774aa0c875
commit e7d200c4a6
17 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/index.js
View file

@ -231,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");
@ -244,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;
};

4
app/assets/javascripts/index/export.js
View file

@ -52,16 +52,18 @@ OSM.Export = function(map) {
$("#export_tab").addClass("current");
$("#sidebar").removeClass("minimized");
map.invalidateSize();
$('#sidebar_content').load(path, page.load);
$("#sidebar_content").load(path, page.load);
};
page.load = function() {
$("#sidebar").removeClass("minimized");
map
.addLayer(locationFilter)
.on("moveend", update);
$("#maxlat, #minlon, #maxlon, #minlat").change(boundsChanged);
$("#drag_box").click(enableFilter);
$("#sidebar_content .close").on("click", page.minimizeSidebar);
update();
};

2
app/assets/javascripts/index/history.js
View file

@ -99,12 +99,12 @@ OSM.History = function(map) {
page.pushstate = page.popstate = function(path) {
$("#history_tab").addClass("current");
$("#sidebar").removeClass("minimized");
map.invalidateSize();
$("#sidebar_content").load(path, page.load);
};
page.load = function() {
$("#sidebar").removeClass("minimized");
map
.on("moveend", loadData)
.addLayer(group);

2
app/assets/javascripts/index/search.js
View file

@ -49,12 +49,12 @@ OSM.Search = function(map) {
page.pushstate = page.popstate = function(path) {
var params = querystring.parse(path.substring(path.indexOf('?') + 1));
$("#query").val(params.query);
$("#sidebar").removeClass("minimized");
map.invalidateSize();
$("#sidebar_content").load(path, page.load);
};
page.load = function() {
$("#sidebar").removeClass("minimized");
$(".search_results_entry").each(function() {
var entry = $(this);
$.ajax({