Hide export button when export area is too large, closes #30

[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..199f226f5e18b1e5713c610f870ad7e0798f73ed 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();
   }
 
     validateControls();
   }
 

-  function enableFilter() {
-    if (!locationFilter.getBounds().isValid()) {
-      locationFilter.setBounds(map.getBounds().pad(-0.2));
-    }
+  function enableFilter(e) {
+    e.preventDefault();

 
     $("#drag_box").hide();
 
     $("#drag_box").hide();

+
+    locationFilter.setBounds(map.getBounds().pad(-0.2));

     locationFilter.enable();
   }
 
     locationFilter.enable();
   }
 


@@ -46,20 +46,25 @@ OSM.Export = function(map) {
 
   function validateControls() {
     $("#export_osm_too_large").toggle(getBounds().getSize() > OSM.MAX_REQUEST_AREA);
 
   function validateControls() {
     $("#export_osm_too_large").toggle(getBounds().getSize() > OSM.MAX_REQUEST_AREA);

+    $("#export_commit").toggle(getBounds().getSize() < OSM.MAX_REQUEST_AREA);

   }
 
   page.pushstate = page.popstate = function(path) {
     $("#export_tab").addClass("current");
   }
 
   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() {
   };
 
   page.load = function() {

+    $("#sidebar").removeClass("minimized");

     map
       .addLayer(locationFilter)
       .on("moveend", update);
 
     $("#maxlat, #minlon, #maxlon, #minlat").change(boundsChanged);
     $("#drag_box").click(enableFilter);
     map
       .addLayer(locationFilter)
       .on("moveend", update);
 
     $("#maxlat, #minlon, #maxlon, #minlat").change(boundsChanged);
     $("#drag_box").click(enableFilter);

+    $("#sidebar_content .close").on("click", page.minimizeSidebar);

 
     update();
   };
 
     update();
   };