Changeset 9616

Timestamp:

08/10/09 06:10:29 (13 months ago)

Author:

fredj

Message:

trigger an event when the layer's opacity change. r=elemoine (closes #2112)

Location:

trunk/openlayers

Files:

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

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -1110 +1110 @@
                                                  null, null, null, opacity);
             }
+            if (this.map != null) {
+                this.map.events.triggerEvent("changelayer", {
+                    layer: this,
+                    property: "opacity"
+                });
+            }
         }
     },

trunk/openlayers/lib/OpenLayers/Map.js

@@ -62 +62 @@
      *      object will include a *layer* property that references the removed
      *      layer.
-     *  - *changelayer* triggered after a layer name change, order 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,
-     *      visibility, or order).
+     *  - *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).
      *  - *movestart* triggered after the start of a drag, pan, or zoom
      *  - *move* triggered after each drag, pan, or zoom

trunk/openlayers/tests/Layer.html

@@ -470 +470 @@
         
     }
-
+    
+    function test_setOpacity(t) {
+        t.plan(5);
+
+        var map, layer, log;
+        
+        map = new OpenLayers.Map("map");
+        layer = new OpenLayers.Layer("");
+        map.addLayer(layer);
+
+        log = [];
+        map.events.register('changelayer', t, function(event) {
+            log.push({layer: event.layer, property: event.property});
+        });
+        layer.setOpacity(0.42);
+        t.eq(layer.opacity, 0.42,
+             "setOpacity() set layer.opacity to correct value");
+        t.eq(log.length, 1,
+             "setOpacity() triggers changelayer once");
+        t.ok(log[0].layer == layer,
+             "changelayer listener called with expected layer");
+        t.eq(log[0].property, "opacity",
+             "changelayer listener called with expected property");
+
+        // This call must not trig the event because the opacity value is the same.
+        log = [];
+        layer.setOpacity(0.42);
+        t.eq(log.length, 0,
+             "setOpacity() does not trigger changelayer if the opacity value is the same");
+    }