Merge branch 'redesign'

[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 413caea3f737aa666c37687d2583c36f78205598..053f5169fa9832e622695042b88d18357b204169 100644 (file)
--- a/app/assets/javascripts/index/export.js
+++ b/app/assets/javascripts/index/export.js
@@ -14,11 +14,9 @@ OSM.Export = function(map) {
 
   function boundsChanged() {
     var bounds = getBounds();
-
     map.fitBounds(bounds);
     locationFilter.setBounds(bounds);
-
-    enableFilter();
+    locationFilter.enable();
     validateControls();
   }
 
@@ -29,6 +27,7 @@ OSM.Export = function(map) {
 
     locationFilter.setBounds(map.getBounds().pad(-0.2));
     locationFilter.enable();
+    validateControls();
   }
 
   function update() {
@@ -51,7 +50,7 @@ OSM.Export = function(map) {
 
   page.pushstate = page.popstate = function(path) {
     $("#export_tab").addClass("current");
-    $("#sidebar_content").load(path, page.load);
+    OSM.loadSidebarContent(path, page.load);
   };
 
   page.load = function() {
@@ -64,6 +63,7 @@ OSM.Export = function(map) {
     $("#sidebar_content .close").on("click", page.minimizeSidebar);
 
     update();
+    return map.getState();
   };
 
   page.unload = function() {