Changeset 8581

Timestamp:

01/04/09 22:46:34 (6 months ago)

Author:

tschaub

Message:

Take care not to handle features without a layer. These are typically destroyed features - but could be some other sort of miscreants. Thanks for the report igrcic. r=crschmidt (closes #1806).

Files:

• trunk/openlayers/lib/OpenLayers/Handler/Feature.js (modified) (5 diffs)
• trunk/openlayers/tests/Handler/Feature.html (modified) (2 diffs)

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

@@ -219 +219 @@
-     */
-    handle: function(evt) {
+        if(this.feature && !this.feature.layer) {
+            // feature has been destroyed
+            this.feature = null;
+        }
-        var type = evt.type;
-        var handled = false;
@@ -224 +228 @@
-        var click = (type == "click" || type == "dblclick");
-        this.feature = this.layer.getFeatureFromEvent(evt);
-
+
+
+
+
+
+
+
+
+
-            var inNew = (this.feature != this.lastFeature);
-            if(this.geometryTypeMatches(this.feature)) {
@@ -230 +242 @@
-                if(previouslyIn && inNew) {
-                    // out of last feature and in to another
-
+
+
+
-                    this.triggerCallback(type, 'in', [this.feature]);
-                } else if(!previouslyIn || click) {
@@ -240 +254 @@
-            } else {
-                // not in to a feature
-previouslyIn && inNew || (click && this.lastFeature
+this.lastFeature && (previouslyIn && inNew || click
-                    // out of last feature for the first time
-                    this.triggerCallback(type, 'out', [this.lastFeature]);
@@ -252 +266 @@
-            }
-        } else {
-
-
+
-                this.triggerCallback(type, 'out', [this.lastFeature]);
-            }

trunk/openlayers/tests/Handler/Feature.html

@@ -293 +293 @@
-
-    function test_destroyed_feature(t) {
-
+
+
+
-        var map = new OpenLayers.Map('map');
-        var control = new OpenLayers.Control();
@@ -299 +301 @@
-        var layer = new OpenLayers.Layer();
-        layer.removeFeatures = function() {};
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        layer.getFeatureFromEvent = function(evt) {return feature};
-        map.addLayer(layer);
-        var handler = new OpenLayers.Handler.Feature(control, layer);
-        handler.activate();
-        var count = 0;
-        handler.callback = function(type, featurelist) {
-            ++count;
-            t.eq(featurelist[0].id, feature.id, type + ": correct feature sent to callback");
-        }
-        handler.handle({type: "click"});
+        // confirm that feature was handled
+        t.eq(count, 1, "[click] callback called once");
+        t.eq(lastType, "click", "[click] correct callback type");
+        t.eq(lastHandled[0].id, feature.id, "[click] correct feature sent to callback");
-        
-        // now destroy the feature and confirm that the callback is not called again
-        feature.destroy();
-        handler.handle({type: "click"});
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-