Changeset 7610

Timestamp:

07/30/08 13:10:04 (4 months ago)

Author:

euzuro

Message:

fix broken register() on events r=tschaub (Closes #1502)

Files:

• trunk/openlayers/lib/OpenLayers/Events.js (modified) (4 diffs)
• trunk/openlayers/tests/Events.html (modified) (5 diffs)
• trunk/openlayers/tests/Layer/Grid.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Events.js

@@ -407 +407 @@
-        this.object     = object;
-        this.element    = element;
-        this.eventTypes = eventTypes;
-        this.fallThrough = fallThrough;
-        this.listeners  = {};
@@ -419 +418 @@
-        // if eventTypes is specified, create a listeners list for each 
-        // custom application event.
-
-
-
+
+
+
+
-            }
-        }
@@ -458 +458 @@
-    addEventType: function(eventName) {
-        if (!this.listeners[eventName]) {
+            this.eventTypes.push(eventName);
-            this.listeners[eventName] = [];
-        }
@@ -533 +534 @@
-    register: function (type, obj, func) {
-
-func != null
-((this.eventTypes && OpenLayers.Util.indexOf(this.eventTypes, type) != -1) ||
-
+ (func != null)
+ (OpenLayers.Util.indexOf(this.eventTypes, type) != -1) ) {
+
-            if (obj == null)  {
-                obj = this.object;
-            }
-            var listeners = this.listeners[type];
-
-
-
+
-        }
-    },

trunk/openlayers/tests/Events.html

@@ -13 +13 @@
-        var browserTypes = OpenLayers.Events.prototype.BROWSER_EVENTS;
-
-5 + eventTypes.length + 
+4 + 2*eventTypes.length + 2*
-
-        t.plan( totalTests );
@@ -23 +23 @@
-        t.ok(events.object ==obj, " 'object' property correctly set");
-        t.ok(events.element == mapDiv, " 'element' property correctly set");
-        t.ok(events.eventTypes == eventTypes, " 'eventTypes' property correctly set");
-
-
-        for (var i = 0; i < browserTypes.length; i++) {
-
-
+
+
+
-        }
-        for (var i = 0; i < eventTypes.length; i++) {
-
-
+
+
+
-        }
-
@@ -40 +41 @@
-              "init of Events with null object/element/eventTypes still creates listeners array" );
-    }
+
+    function XXXtest_Events_register(t){
+        t.plan(4);
+
+        var ev = {
+            'object': {},
+            'listeners': {
+                'listenerA': { 
+                    'push': function(options){
+                                gObjA = options.obj;
+                                gFuncA = options.func;
+                            }
+                },
+                'listenerB': { 
+                    'push': function(options){
+                                gObjB = options.obj;
+                                gFuncB = options.func;
+                            }
+                }
+            },
+            'eventTypes': ['listenerA', 'listenerB']
+        };
+        
+        var type = null;
+        var object = null;
+        var func = null;
+
+      //func null
+        gObjA = null; gFuncA = null; gObjB = null; gFuncB = null;
+        OpenLayers.Events.prototype.register.apply(ev, [type, object, func]);
+        t.ok((gObjA == null) && (gFuncA == null) && 
+             (gObjB == null) && (gFuncB == null), "no push called func null"); 
+        
+      //valid func, type not in ev.eventTypes
+        func = function() {};
+        gObjA = null; gFuncA = null; gObjB = null; gFuncB = null;
+        OpenLayers.Events.prototype.register.apply(ev, [type, object, func]);
+        t.ok((gObjA == null) && (gFuncA == null) && 
+             (gObjB == null) && (gFuncB == null), "no push called func null"); 
+
+      //valid func, type in ev.eventTypes, null obj
+        type = 'listenerA';
+        gObjA = null; gFuncA = null; gObjB = null; gFuncB = null;
+        OpenLayers.Events.prototype.register.apply(ev, [type, object, func]);
+        t.ok((gObjA == ev.object) && (gFuncA == func) && 
+             (gObjB == null) && (gFuncB == null), "push called on listenerA's mock array when type passed in 'listenerA'. events.object taken since obj is null."); 
+        
+      //valid func, type in ev.eventTypes, valid obj
+        type = 'listenerB';
+        object = {};
+        gObjA = null; gFuncA = null; gObjB = null; gFuncB = null;
+        OpenLayers.Events.prototype.register.apply(ev, [type, object, func]);
+        t.ok((gObjA == null) && (gFuncA == null) && 
+             (gObjB == object) && (gFuncB == func), "push called on listenerB's mock array when type passed in 'listenerB'."); 
+        
+    }
-
-    function test_Events_register_unregister(t) {
@@ -356 +413 @@
-    function test_Events_addEventType(t) {
-
-6
+8
- 
-        var mapDiv = OpenLayers.Util.getElement('map');
@@ -370 +427 @@
-        var newEventType = "onFoo";
-        t.ok( events.listeners[newEventType] == null, "event type not yet registered has null entry in listeners array");
+        t.ok( OpenLayers.Util.indexOf(events.eventTypes, newEventType) == -1, "event type not yet registered not in eventTypes array");
-
-        events.addEventType(newEventType);
-        t.eq( events.listeners[newEventType].length, 0, "event type passed to addEventType correctly set up" );
+        t.ok( OpenLayers.Util.indexOf(events.eventTypes, newEventType) != -1, "event type passed to addEventType in eventTypes array");
-        
-        var func = function () {};

trunk/openlayers/tests/Layer/Grid.html

@@ -24 +24 @@
-
-    function test_Layer_Grid_constructor (t) {
-5
+8
-                       
-        layer = new OpenLayers.Layer.Grid(name, url, params, null);
@@ -32 +32 @@
-        t.eq( layer.numLoadingTiles, 0, "numLoadingTiles starts at 0");
-        t.ok( layer.events.listeners["tileloaded"] != null, "'tileloaded' event added to layer's event types");
-
+
+
+
+
+
+
+
+
+
+
-    }
-