Sidebar close reverts to 'view' state

[rails.git] / app / assets / javascripts / index / export.js

diff --git a/app/assets/javascripts/index/export.js b/app/assets/javascripts/index/export.js
index 70684eca9dac0dd70b26f8ebb57c636aa023f9a0..23c50323647a16313da162971dd4410215ff82b4 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -22,12 +22,12 @@ OSM.Export = function(map) {
     validateControls();
   }
 
-  function enableFilter() {
-    if (!locationFilter.getBounds().isValid()) {
-      locationFilter.setBounds(map.getBounds().pad(-0.2));
-    }
+  function enableFilter(e) {
+    e.preventDefault();
 
     $("#drag_box").hide();
+
+    locationFilter.setBounds(map.getBounds().pad(-0.2));
     locationFilter.enable();
   }
 
@@ -50,16 +50,20 @@ OSM.Export = function(map) {
 
   page.pushstate = page.popstate = function(path) {
     $("#export_tab").addClass("current");
-    $('#sidebar_content').load(path, page.load);
+    $("#sidebar").removeClass("minimized");
+    map.invalidateSize();
+    $("#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();
   };