Changeset 7879

Timestamp:

08/27/08 10:02:21 (3 months ago)

Author:

ahocevar

Message:

Made the Feature handler more robust to things that are related to changing layer order on the map, by registering an event handler that will bring the handler's layer back to the top of the layer stack in the DOM. Contains a manual test. r=elemoine (closes #1628)

Files:

• trunk/openlayers/lib/OpenLayers/Handler/Feature.js (modified) (4 diffs)
• trunk/openlayers/lib/OpenLayers/Layer.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)
• trunk/openlayers/tests/Handler/Feature.html (modified) (5 diffs)
• trunk/openlayers/tests/manual/vector-layer-zindex.html (added)

trunk/openlayers/lib/OpenLayers/Handler/Feature.js

@@ -100 +100 @@
-     */
-    stopUp: false,
-
-    /**
-     * Property: layerIndex
-     * {Int}
-     */
-    layerIndex: null,
-    
-    /**
@@ -301 +295 @@
-        var activated = false;
-        if(OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
-
-
+
+
+
+
+
+
-            activated = true;
-        }
@@ -309 +307 @@
-    
-    /**
-
-
+de
+f
-     *
-     * Returns: 
@@ -318 +316 @@
-        var deactivated = false;
-        if(OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-
-
-
+
-            this.feature = null;
-            this.lastFeature = null;
-            this.down = null;
-            this.up = null;
+            this.map.events.un({
+                "removelayer": this.handleMapEvents,
+                "changelayer": this.handleMapEvents,
+                scope: this
+            });
-            deactivated = true;
-        }
-        return deactivated;
+    },
+    
+    /**
+     * Method handleMapEvents
+     * 
+     * Parameters:
+     * evt - {Object}
+     */
+    handleMapEvents: function(evt) {
+        if (!evt.property || evt.property == "order") {
+            this.moveLayerToTop();
+        }
+    },
+    
+    /**
+     * Method: moveLayerToTop
+     * Moves the layer for this handler to the top, so mouse events can reach
+     * it.
+     */
+    moveLayerToTop: function() {
+        var index = Math.max(this.map.Z_INDEX_BASE['Feature'] - 1,
+            this.layer.getZIndex()) + 1;
+        this.layer.setZIndex(index);
+        
+    },
+    
+    /**
+     * Method: moveLayerBack
+     * Moves the layer back to the position determined by the map's layers
+     * array.
+     */
+    moveLayerBack: function() {
+        var index = this.layer.getZIndex() - 1;
+        if (index >= this.map.Z_INDEX_BASE['Feature']) {
+            this.layer.setZIndex(index);
+        } else {
+            this.map.setLayerZIndex(this.layer,
+                this.map.getLayerIndex(this.layer));
+        }
-    },
-

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -1100 +1100 @@
-
-    /**
+     * Method: getZIndex
+     * 
+     * Returns: 
+     * {Integer} the z-index of this layer
+     */    
+    getZIndex: function () {
+        return this.div.style.zIndex;
+    },
+
+    /**
-     * Method: setZIndex
-     * 

trunk/openlayers/lib/OpenLayers/Map.js

@@ -24 +24 @@
-     * {Object} Base z-indexes for different classes of thing 
-     */
-
+
+
+
+
+
+
+
-
-    /**

trunk/openlayers/tests/Handler/Feature.html

@@ -31 +31 @@
-
-    function test_Handler_Feature_activate(t) {
-4
+3
-        var map = new OpenLayers.Map('map');
-        var control = new OpenLayers.Control();
@@ -48 +48 @@
-        t.ok(activated,
-             "activate returns true if the handler was not already active");
-        t.eq(handler.layerIndex, zIndex,
-             "layerIndex property properly set");
-        t.eq(parseInt(layer.div.style.zIndex),
-Popup'] - 1
+Feature']
-             "layer z-index properly adjusted");
-        
@@ -228 +226 @@
-        var layer = new OpenLayers.Layer();
-        map.addLayer(layer);
+        var layerIndex = parseInt(layer.div.style.zIndex);
+        
-        var handler = new OpenLayers.Handler.Feature(control, layer);
-        handler.active = false;
@@ -235 +235 @@
-        
-        handler.active = true;
-        handler.layerIndex = Math.floor(Math.random() * 10);
-
-        deactivated = handler.deactivate();
@@ -241 +240 @@
-             "deactivate returns true if the handler was active already");
-        t.eq(parseInt(layer.div.style.zIndex),
-handler.
+
-             "deactivate sets the layer z-index back");
-    }