Changeset 4047

Timestamp:

08/27/07 08:46:29 (1 year ago)

Author:

crschmidt

Message:

(Closes #730) These changes make the permalink smarter in the case where we
already have some URL args in the URL. Thanks to penyaskito for the bug
report.

Files:

• trunk/openlayers/lib/OpenLayers/Control/Permalink.js (modified) (2 diffs)
• trunk/openlayers/tests/Control/test_Permalink.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Control/Permalink.js

@@ -36 +36 @@
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-        this.element = OpenLayers.Util.getElement(element);        
-
-
-
+
-    },
-
@@ -117 +115 @@
-            }
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        this.element.href = href;
-    }, 

trunk/openlayers/tests/Control/test_Permalink.html

@@ -50 +50 @@
-        t.eq(map.controls[3].div.firstChild.nodeName, "A", "Permalink control creates div with 'a' inside." );
-  }
+  function test_05_Control_Permalink_base_with_query (t) {
+      t.plan( 3 );
+  
+      control = new OpenLayers.Control.Permalink('permalink', "./edit.html?foo=bar" );
+      map = new OpenLayers.Map('map');
+      layer = new OpenLayers.Layer.WMS('Test Layer', "http://example.com" );
+      map.addLayer(layer);
+      if (!map.getCenter())  map.zoomToMaxExtent();
+      map.addControl(control);
+      map.pan(5, 0);
+      OpenLayers.Util.getElement('edit_permalink').href = './edit.html?foo=bar&lat=0&lon=1.75781&zoom=2&layers=B';
+      t.eq(OpenLayers.Util.getElement('permalink').href, OpenLayers.Util.getElement('edit_permalink').href, "Panning sets permalink with base and querystring");
+      
+      control = new OpenLayers.Control.Permalink('permalink', "./edit.html?foo=bar&" );
+      map.addControl(control);
+      map.pan(0, 0);
+      t.eq(OpenLayers.Util.getElement('permalink').href, OpenLayers.Util.getElement('edit_permalink').href, "Panning sets permalink with base and querystring ending with '&'");
+      
+      control = new OpenLayers.Control.Permalink('permalink', "./edit.html?" );
+      OpenLayers.Util.getElement('edit_permalink').href = './edit.html?lat=0&lon=1.75781&zoom=2&layers=B';
+      map.addControl(control);
+      map.pan(5, 0);
+      map.pan(-5, 0);
+      t.eq(OpenLayers.Util.getElement('permalink').href, OpenLayers.Util.getElement('edit_permalink').href, "Panning sets permalink with base and querystring ending with '?'");
+
+  }
-  // -->
-  </script>