Extra little test, setting the language on the diary fixtures.

[rails.git] / app / views / browse / start.rjs

diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index 04f5e12c9eb4fa497b410799091b9869c389fd54..8c8d622606c71910156540a8c01cd1f1de3c5afc 100644 (file)
--- a/app/views/browse/start.rjs
+++ b/app/views/browse/start.rjs
@@ -15,6 +15,8 @@ page << <<EOJ
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
     
   function startBrowse() {
   OpenLayers.Feature.Vector.style['default'].cursor = "pointer";
     
   function startBrowse() {

+    browseActive = true;
+

     openSidebar({ onclose: stopBrowse });
 
     var vectors = new OpenLayers.Layer.Vector();
     openSidebar({ onclose: stopBrowse });
 
     var vectors = new OpenLayers.Layer.Vector();


@@ -32,8 +34,6 @@ page << <<EOJ
 
     map.events.register("moveend", map, showData);
     map.events.triggerEvent("moveend");
 
     map.events.register("moveend", map, showData);
     map.events.triggerEvent("moveend");

-
-    browseActive = true;

   }
 
   function showData() {
   }
 
   function showData() {


@@ -50,11 +50,6 @@ page << <<EOJ
     if (browseActive) {
       browseActive = false;
 
     if (browseActive) {
       browseActive = false;
 

-      if (browseDataLayer) {
-        browseDataLayer.destroy();
-        browseDataLayer = null; 
-      } 
-

       if (browseSelectControl) {   
         browseSelectControl.destroy();  
         browseSelectControl = null;
       if (browseSelectControl) {   
         browseSelectControl.destroy();  
         browseSelectControl = null;


@@ -70,11 +65,16 @@ page << <<EOJ
         browseActiveFeature = null; 
       }
 
         browseActiveFeature = null; 
       }
 

+      if (browseDataLayer) {
+        browseDataLayer.destroy();
+        browseDataLayer = null; 
+      } 
+

       map.dataLayer.setVisibility(false);
       map.events.unregister("moveend", map, showData);
     }    
   }
       map.dataLayer.setVisibility(false);
       map.events.unregister("moveend", map, showData);
     }    
   }

-    
+

   function startDrag() {
     $("browse_select_box").innerHTML='Drag a box on the map to select an area';
 
   function startDrag() {
     $("browse_select_box").innerHTML='Drag a box on the map to select an area';
 


@@ -84,7 +84,7 @@ page << <<EOJ
   };
 
   $("browse_select_box").onclick = startDrag;
   };
 
   $("browse_select_box").onclick = startDrag;

-    
+

   function useMap() {
     var bounds = map.getExtent();
     var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);
   function useMap() {
     var bounds = map.getExtent();
     var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);


@@ -110,7 +110,7 @@ page << <<EOJ
   }
 
   $("browse_select_view").onclick = useMap;
   }
 
   $("browse_select_view").onclick = useMap;

-    
+

   function endDrag(bbox) {
     var bounds = bbox.getBounds();
     var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);
   function endDrag(bbox) {
     var bounds = bbox.getBounds();
     var projected = bounds.clone().transform(map.getProjectionObject(), epsg4326);


@@ -124,7 +124,7 @@ page << <<EOJ
     $("browse_select_box").innerHTML = "Manually select a different area";
     $("browse_select_view").style.display = "inline";
   }
     $("browse_select_box").innerHTML = "Manually select a different area";
     $("browse_select_view").style.display = "inline";
   }

-    
+

   function displayFeatureWarning() {
     clearStatus();
 
   function displayFeatureWarning() {
     clearStatus();
 


@@ -143,7 +143,7 @@ page << <<EOJ
     $("browse_content").innerHTML = "";
     $("browse_content").appendChild(div);
   }
     $("browse_content").innerHTML = "";
     $("browse_content").appendChild(div);
   }

-    
+

   function loadFeatureList() {
     browseDataLayer.addFeatures(browseFeatureList);
     browseDataLayer.events.triggerEvent("loadend");
   function loadFeatureList() {
     browseDataLayer.addFeatures(browseFeatureList);
     browseDataLayer.events.triggerEvent("loadend");


@@ -153,7 +153,7 @@ page << <<EOJ
     return false;
   }    
 
     return false;
   }    
 

-  function customDataLoader(request) { 
+  function customDataLoader(request) {

     if (browseActive) {
       var doc = request.responseXML;
 
     if (browseActive) {
       var doc = request.responseXML;
 


@@ -189,7 +189,7 @@ page << <<EOJ
     if (size > 0.25) {
       setStatus("Unable to load: Bounding box size of " + size + " is too large (must be smaller than 0.25)");
     } else {
     if (size > 0.25) {
       setStatus("Unable to load: Bounding box size of " + size + " is too large (must be smaller than 0.25)");
     } else {

-      loadGML("/api/0.5/map?bbox=" + projected.toBBOX());
+      loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());

     }
   }
 
     }
   }
 


@@ -215,16 +215,16 @@ page << <<EOJ
         requestSuccess: customDataLoader,
         displayInLayerSwitcher: false,
         styleMap: new OpenLayers.StyleMap({
         requestSuccess: customDataLoader,
         displayInLayerSwitcher: false,
         styleMap: new OpenLayers.StyleMap({

-          default: style,
-          select: { strokeColor: '#0000ff', strokeWidth: 8 }
+          'default': style,
+          'select': { strokeColor: '#0000ff', strokeWidth: 8 }

         })
       });
       browseDataLayer.events.register("loadend", browseDataLayer, dataLoaded );
       map.addLayer(browseDataLayer);
             
       browseSelectControl = new OpenLayers.Control.SelectFeature(browseDataLayer, { onSelect: onFeatureSelect });
         })
       });
       browseDataLayer.events.register("loadend", browseDataLayer, dataLoaded );
       map.addLayer(browseDataLayer);
             
       browseSelectControl = new OpenLayers.Control.SelectFeature(browseDataLayer, { onSelect: onFeatureSelect });

-      browseSelectControl.handler.stopDown = false;
-      browseSelectControl.handler.stopUp = false;
+      browseSelectControl.handlers.feature.stopDown = false;
+      browseSelectControl.handlers.feature.stopUp = false;

       map.addControl(browseSelectControl);
       browseSelectControl.activate();
     } else {
       map.addControl(browseSelectControl);
       browseSelectControl.activate();
     } else {


@@ -393,7 +393,7 @@ page << <<EOJ
     this.link.href = "";
     this.link.innerHTML = "Wait...";
 
     this.link.href = "";
     this.link.innerHTML = "Wait...";
 

-    new Ajax.Request("/api/0.5/" + this.type + "/" + this.feature.osm_id + "/history", {
+    new Ajax.Request("/api/#{API_VERSION}/" + this.type + "/" + this.feature.osm_id + "/history", {

       onComplete: OpenLayers.Function.bind(displayHistory, this)
     });
 
       onComplete: OpenLayers.Function.bind(displayHistory, this)
     });