Changeset 9618

Timestamp:

08/13/09 06:31:47 (13 months ago)

Author:

elemoine

Message:

add changelayer event to mergeNewParams function, r=bartvde (closes #2179)

Location:

trunk/openlayers

Files:

• lib/OpenLayers/Layer/HTTPRequest.js (modified) (1 diff)
• lib/OpenLayers/Map.js (modified) (1 diff)
• tests/Layer/HTTPRequest.html (modified) (3 diffs)

trunk/openlayers/lib/OpenLayers/Layer/HTTPRequest.js

@@ -122 +122 @@
     mergeNewParams:function(newParams) {
         this.params = OpenLayers.Util.extend(this.params, newParams);
-        return this.redraw();
+        var ret = this.redraw();
+        if(this.map != null) {
+            this.map.events.triggerEvent("changelayer", {
+                layer: this,
+                property: "params"
+            });
+        }
+        return ret;
     },
 

trunk/openlayers/lib/OpenLayers/Map.js

@@ -63 +63 @@
      *      layer.
      *  - *changelayer* triggered after a layer name change, order change,
-     *      opacity change or visibility change (due to resolution thresholds).
-     *      Listeners will receive an event object with *layer* and *property*
-     *      properties.  The *layer* property will be a reference to the
-     *      changed layer.  The *property* property will be a key to the
-     *      changed property (name, order, opacity or visibility).
+     *      opacity change, params change or visibility change
+     *      (due to resolution thresholds). Listeners will receive an event
+     *      object with *layer* and *property* properties. The *layer*
+     *      property will be a reference to the changed layer. 
+     *      The *property* property will be a key to the
+     *      changed property (name, order, opacity, params or visibility).
      *  - *movestart* triggered after the start of a drag, pan, or zoom
      *  - *move* triggered after each drag, pan, or zoom

trunk/openlayers/tests/Layer/HTTPRequest.html

@@ -66 +66 @@
 
     function test_Layer_HTTPRequest_mergeNewParams (t) {
-        t.plan( 4 );
-
+        t.plan( 8 );
+
+        var map = new OpenLayers.Map('map');
         layer = new OpenLayers.Layer.HTTPRequest(name, url, params, options);
+        map.addLayer(layer);
+
+        var scope = {some: "scope"}, log = [];
+        map.events.on({
+            changelayer: function(e) {
+                log.push({layer: e.layer, property: e.property, scope: this});
+            },
+            scope: scope
+        });
         
         var newParams = { layers: 'sooper', 
@@ -77 +87 @@
         t.eq( layer.params.layers, "sooper", "mergeNewParams() overwrites well");
         t.eq( layer.params.chickpeas, "image/png", "mergeNewParams() adds well");
+        t.eq( log.length, 1, "mergeNewParams() triggers changelayer once");
+        t.ok( log[0].layer == layer, "mergeNewParams() passes changelayer listener the expected layer");
+        t.ok( log[0].property == "params", "mergeNewParams() passes changelayer listener the property \"params\"");
+        t.eq( log[0].scope, scope, "mergeNewParams() executes changelayer listener with expected scope");
 
         newParams.chickpeas = 151;
@@ -86 +100 @@
         }
         layer.mergeNewParams();
-
-
     }