Ticket #621: FINAL-eventCacheID.2.patch

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");        
-    }
-
-
+s
-        t.plan(2);
-
-        var div   = OpenLayers.Util.getElement('test');
-        var obj   = {};
-        var events = new OpenLayers.Events(obj, div);
+
-        // +1 because of blocking dragstart in attachToElement()
-"test"
+div._eventCacheID
-             OpenLayers.Events.prototype.BROWSER_EVENTS.length + 1,
-             "construction creates new arrayin hash, registers appropriate events");
-             
@@ -218 +219 @@
-        t.eq(OpenLayers.Event.observers["test"], null,
-             "destruction removes the event observer from hash");
-    }
+    
+    function test_06_Event(t) {
+        t.plan(24);
+        
+        var div   = OpenLayers.Util.getElement('test');
+        var name = "mouseover";
+        var func = function() {};
+
+      //1st elem 1st listener        
+        OpenLayers.Event.observe(div, name, func);
+
+        var cacheID = div._eventCacheID;
+        t.ok(cacheID, "element given new cache id");
+        
+        var elementObservers = OpenLayers.Event.observers[cacheID];
+        
+        t.ok(elementObservers, "new cache bucket made for event");
+        t.eq(elementObservers.length, 1, "one listener registered");        
+        
+        var listener = elementObservers[0];
+        
+        t.ok(listener.element == div, "element registered");
+        t.eq(listener.name, name, "name registered");
+        t.ok(listener.observer == func, "function registered");
+        t.eq(listener.useCapture, false, "useCapture defaults to false");
+
+      //1st elem 2nd listener        
+        name = "mouseout";
+        var newFunc = function() {};
+      
+        OpenLayers.Event.observe(div, name, newFunc, true);
+        var newCacheID = div._eventCacheID;
+        t.eq(newCacheID, cacheID, "element's cache id not overridden");
+        
+        t.eq(elementObservers.length, 2, "listener added to existing bucket");        
+        
+        var listener = elementObservers[1];
+        
+        t.ok(listener.element == div, "element registered");
+        t.eq(listener.name, name, "name registered");
+        t.ok(listener.observer == newFunc, "function registered");
+        t.eq(listener.useCapture, true, "useCapture correctly registered");
+
+      //2st elem 1st listener        
+        div = OpenLayers.Util.getElement('test2'); 
+        OpenLayers.Event.observe(div, name, func);
+
+        var cacheID = div._eventCacheID;
+        t.ok(cacheID, "new element given new cache id");
+        t.ok(cacheID != newCacheID, "new cache id is unique");
+        
+        elementObservers = OpenLayers.Event.observers[cacheID];
+        
+        t.ok(elementObservers, "new cache bucket made for event");
+        t.eq(elementObservers.length, 1, "one listener registered");        
+        
+        var listener = elementObservers[0];
+        
+        t.ok(listener.element == div, "element registered");
+        t.eq(listener.name, name, "name registered");
+        t.ok(listener.observer == func, "function registered");
+        t.eq(listener.useCapture, false, "useCapture defaults to false");
+
+      //stopObservingElement by element
+        OpenLayers.Event.stopObservingElement(div);
+        elementObservers = OpenLayers.Event.observers[cacheID];
+        t.ok(elementObservers == null, "stopObservingElement by elem works");
+
+      //stopObservingElement by id
+        OpenLayers.Event.stopObservingElement("test");
+        elementObservers = OpenLayers.Event.observers[newCacheID];
+        t.ok(elementObservers == null, "stopObservingElement by id works");
+
+
+      //unloadCache by element
+        OpenLayers.Event.observe(div, name, func);
+        
+        OpenLayers.Event.unloadCache();
+
+        elementObservers = OpenLayers.Event.observers[cacheID];
+        t.ok(elementObservers == null, "stopObservingElement by elem works");
+
+        
+    }
+
+
-   
-  // -->
-  </script>
@@ -225 +312 @@
-<body>
-    <div id="map" style="width: 1024px; height: 512px;"/>
-    <div id="test"></div>
+    <div id="test2"></div>
-</body>
-</html>

lib/OpenLayers/Events.js

@@ -10 +10 @@
- */
-OpenLayers.Event = {
-
-
+
+
-     * 
-     * @type Object
-     */
@@ -118 +119 @@
-        if (!this.observers) {
-            this.observers = new Object();
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
-        //if there is not yet a hash entry for this element, add one
-element.id
-element.id
+cacheID
+cacheID
-        }
-
-        //add a new observer to this element's list
-element.id
+cacheID
-            'element': element,
-            'name': name,
-            'observer': observer,
@@ -147 +159 @@
-     * @param {DOMElement || String} elementParam
-     */
-    stopObservingElement: function(elementParam) {
+        var element = OpenLayers.Util.getElement(elementParam);
+        var cacheID = element._eventCacheID;
-
-var elementId = (typeof elementParam == "string") ? elementParam 
-                        : OpenLayers.Util.getElement(elementParam).id;
+this._removeElementObservers(OpenLayers.Event.observers[cacheID]);
+},
-
-
+
+
+
+
+
+
+
+
-        if (elementObservers) {
-
-
-
+
+
-                var args = new Array(entry.element,
-                                     entry.name,
-                                     entry.observer,
-                                     entry.useCapture);
-                var removed = OpenLayers.Event.stopObserving.apply(this, args);
-                if (!removed) {
-                    i++;
-                }
-            }
-        }
-    },
@@ -181 +198 @@
-        useCapture = useCapture || false;
-    
-        var element = OpenLayers.Util.getElement(elementParam);
-
-
+
-
-        if (name == 'keypress') {
-            if ( navigator.appVersion.match(/Konqueror|Safari|KHTML/) || 
@@ -193 +209 @@
-
-        // find element's entry in this.observers cache and remove it
-        var foundEntry = false;
-elementId
+cacheID
-        if (elementObservers) {
-    
-            // find the specific event type in the element's list
@@ -207 +223 @@
-    
-                    elementObservers.splice(i, 1);
-                    if (elementObservers.length == 0) {
-element.id
+cacheID
-                    }
-                    foundEntry = true;
-                    break; 
@@ -230 +246 @@
-     */
-    unloadCache: function() {
-        if (OpenLayers.Event.observers) {
-
-
+
+
+
+
-            }
-            OpenLayers.Event.observers = false;
-        }