Changeset 2867

Timestamp:

03/23/07 14:22:38 (2 years ago)

Author:

sderle

Message:

Fix the event listener leak, which has been a serious problem when large numbers of markers etc. are created. Closes #510.

Files:

• trunk/openlayers/lib/OpenLayers/Control/Navigation.js (modified) (2 diffs)
• trunk/openlayers/lib/OpenLayers/Events.js (modified) (8 diffs)
• trunk/openlayers/tests/test_Events.html (modified) (2 diffs)

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

@@ -60 +60 @@
-    },
-
+    wheelChange: function(evt, deltaZ) {
+        console.log("wheel " + deltaZ);
+        var newZoom = this.map.getZoom() + deltaZ;
+        if (!this.map.isValidZoomLevel(newZoom)) return;
+
+        var size    = this.map.getSize();
+        var deltaX  = size.w/2 - evt.xy.x;
+        var deltaY  = size.h/2 - evt.xy.y;
+        var newRes  = map.baseLayer.resolutions[newZoom];
+        var zoomPoint = this.map.getLonLatFromPixel(evt.xy);
+        var newCenter = new OpenLayers.LonLat(
+                            zoomPoint.lon + deltaX * newRes,
+                            zoomPoint.lat - deltaY * newRes );
+        console.log(newCenter.toString());
+        this.map.setCenter( newCenter, newZoom );
+    },
+
-    /** User spun scroll wheel up
-     * 
-     */
-    wheelUp: function(evt) {
-
-
+
-    },
-
@@ -72 +88 @@
-     */
-    wheelDown: function(evt) {
-
-
+
-    },
-    

trunk/openlayers/lib/OpenLayers/Events.js

@@ -73 +73 @@
-    for (var i = 0; i < OpenLayers.Event.observers.length; i++) {
-      OpenLayers.Event.stopObserving.apply(this, OpenLayers.Event.observers[i]);
-      OpenLayers.Event.observers[i][0] = null;
-    }
-    OpenLayers.Event.observers = false;
@@ -98 +97 @@
-        || element.detachEvent))
-      name = 'keydown';
+
+    // find entry in this.observers cache array and remove it
+    var observers = OpenLayers.Event.observers;
+    var entry = [element, name, observer, useCapture];
+    for (var i = 0; i < observers.length; i++) {
+        var observer = observers[i];
+
+        //compare all 4 elements of entry with observer
+        var sameEntry = true;        
+        for (var j = 0; j < entry.length; j++) {
+            if (entry[j] != observer[j]) {
+                sameEntry = false;
+                break;
+            }
+        }
+
+        //if we've found it, remove it from the observers array
+        if (sameEntry) {
+            observers.splice(i--, 1);
+            break; 
+        }
+    }
-
-    if (element && element.removeEventListener) {
@@ -115 +136 @@
-}
-
-
-
-/**
- * @class
@@ -145 +164 @@
-
-    /**
+    * @type Function: bound event handler attached to elements
+    * @private
+    */
+    eventHandler: null,
+
+    /** @type Boolean */
+    fallThrough: null,
+
+    /**
-     * @constructor 
-     * 
@@ -161 +189 @@
-        this.listeners  = new Object();
-
+        // keep a bound copy of handleBrowserEvent() so that we can
+        // pass the same function to both Event.observe() and .stopObserving()
+        this.eventHandler = this.handleBrowserEvent.bindAsEventListener(this);
+
-        // if eventTypes is specified, create a listeners list for each 
-        // custom application event.
@@ -174 +206 @@
-
-    /**
+     * 
+     */
+    destroy: function () {
+        if (this.element) {
+            this.detachFromElement();
+        }
+        this.element = null;
+
+        this.listeners = null;
+        this.object = null;
+        this.eventTypes = null;
+        this.fallThrough = null;
+        this.eventHandler = null;
+    },
+
+    /**
-    * @param {HTMLDOMElement} element a DOM element to attach browser events to
-    */
@@ -186 +234 @@
-
-            // use Prototype to register the event cross-browser
-
-
+
-        }
-        // disable dragstart in IE so that mousedown/move/up works normally
-        OpenLayers.Event.observe(element, "dragstart", OpenLayers.Event.stop);
+    },
+    
+    /**
+     * @private
+     */
+    detachFromElement: function () {
+        for (var i = 0; i < this.BROWSER_EVENTS.length; i++) {
+            var eventType = this.BROWSER_EVENTS[i];
+
+            OpenLayers.Event.stopObserving(
+                this.element, eventType, this.eventHandler);
+        }
+
+        // re-enable dragstart in IE
+        OpenLayers.Event.stopObserving(
+            this.element, "dragstart", OpenLayers.Event.stop);
-    },
-
@@ -228 +291 @@
-        }
-    },
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    registerPriority: function (type, obj, func) {
-

trunk/openlayers/tests/test_Events.html

@@ -202 +202 @@
-        t.eq(a, 5, "if Events has no object set and an event is registered also with no object, triggerEvent() calls it without trying to set the context to null");        
-    }
+
+    function test_05_Event_destroy (t) {
+        t.plan(2);
+        var start = OpenLayers.Event.observers.length;
+        var div   = OpenLayers.Util.getElement('test');
+        var obj   = {};
+        var events = new OpenLayers.Events(obj, div);
+        // +1 because of blocking dragstart in attachToElement()
+        t.eq(OpenLayers.Event.observers.length,
+             start + OpenLayers.Events.prototype.BROWSER_EVENTS.length + 1,
+             "construction increases the number of event observers");
+        events = events.destroy();
+        t.eq(OpenLayers.Event.observers.length, start,
+             "destruction restores the number of event observers");
+    }
-   
-  // -->
@@ -208 +223 @@
-<body>
-    <div id="map" style="width: 1024px; height: 512px;"/>
+    <div id="test"></div>
-</body>
-</html>