Move piwik code to a static JS asset

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

diff --git a/app/assets/javascripts/export.js b/app/assets/javascripts/export.js
index a744d0a229c925eba72dd37773778a6677e69bb3..5debb1b075ce8c6c934c882ba471e910ddb44db7 100644 (file)
--- a/app/assets/javascripts/export.js
+++ b/app/assets/javascripts/export.js
@@ -46,7 +46,7 @@ function startExport(sidebarHtml) {
 
   $("#mapnik_scale").change(mapnikSizeChanged);
 
 
   $("#mapnik_scale").change(mapnikSizeChanged);
 

-  openSidebar({ onclose: stopExport });
+  openSidebar();

 
   if (map.baseLayer.name == "Mapnik") {
     $("#format_mapnik").prop("checked", true);
 
   if (map.baseLayer.name == "Mapnik") {
     $("#format_mapnik").prop("checked", true);


@@ -58,7 +58,7 @@ function startExport(sidebarHtml) {
   $("#viewanchor").removeClass("active");
   $("#exportanchor").addClass("active");
 
   $("#viewanchor").removeClass("active");
   $("#exportanchor").addClass("active");
 

-  function stopExport() {
+  $("#sidebar").one("closed", function () {

     $("#viewanchor").addClass("active");
     $("#exportanchor").removeClass("active");
 
     $("#viewanchor").addClass("active");
     $("#exportanchor").removeClass("active");
 


@@ -67,7 +67,7 @@ function startExport(sidebarHtml) {
     map.events.unregister("moveend", map, mapMoved);
     map.events.unregister("changebaselayer", map, htmlUrlChanged);
     map.removeLayer(vectors);
     map.events.unregister("moveend", map, mapMoved);
     map.events.unregister("changebaselayer", map, htmlUrlChanged);
     map.removeLayer(vectors);

-  }
+  });

 
   function getMercatorBounds() {
     var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(),
 
   function getMercatorBounds() {
     var bounds = new OpenLayers.Bounds($("#minlon").val(), $("#minlat").val(),