Make main page flash messages visible

[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 a2d6c4f0738562130f4d800a55d85b198806f4f4..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();
 
   function boundsChanged() {
     var bounds = getBounds();

-

     map.fitBounds(bounds);
     locationFilter.setBounds(bounds);
     map.fitBounds(bounds);
     locationFilter.setBounds(bounds);

-
-    enableFilter();
+    locationFilter.enable();

     validateControls();
   }
 
     validateControls();
   }
 


@@ -29,6 +27,7 @@ OSM.Export = function(map) {
 
     locationFilter.setBounds(map.getBounds().pad(-0.2));
     locationFilter.enable();
 
     locationFilter.setBounds(map.getBounds().pad(-0.2));
     locationFilter.enable();

+    validateControls();

   }
 
   function update() {
   }
 
   function update() {


@@ -51,12 +50,7 @@ OSM.Export = function(map) {
 
   page.pushstate = page.popstate = function(path) {
     $("#export_tab").addClass("current");
 
   page.pushstate = page.popstate = function(path) {
     $("#export_tab").addClass("current");

-    $("#sidebar_content").load(path + "?xhr=1", function(a, b, xhr) {
-      if (xhr.getResponseHeader('X-Page-Title')) {
-        document.title = xhr.getResponseHeader('X-Page-Title');
-      }
-      page.load();
-    });
+    OSM.loadSidebarContent(path, page.load);

   };
 
   page.load = function() {
   };
 
   page.load = function() {


@@ -69,6 +63,7 @@ OSM.Export = function(map) {
     $("#sidebar_content .close").on("click", page.minimizeSidebar);
 
     update();
     $("#sidebar_content .close").on("click", page.minimizeSidebar);
 
     update();

+    return map.getState();

   };
 
   page.unload = function() {
   };
 
   page.unload = function() {