DomEvent fixes, specs

spec/suites/dom/DomEventSpec.js

@@ -1,8 +1,102 @@
 describe('DomEvent', function() {
+	var el;
 
-	describe('#addListener', noSpecs);
-	describe('#removeListener', noSpecs);
+	function simulateClick(el) {
+		if (document.createEvent) {
+			var e = document.createEvent('MouseEvents');
+			e.initMouseEvent('click', true, true, window, 
+					0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			return el.dispatchEvent(e);
+		} else if (el.fireEvent) {
+			return el.fireEvent('onclick');
+		}
+	}
 	
-	describe('#stopPropagation', noSpecs);
-	describe('#preventDefault', noSpecs);
+	beforeEach(function() {
+		el = document.createElement('div');
+		el.style.position = 'absolute';
+		el.style.top = el.style.left = '-10000px';
+		document.body.appendChild(el);
+	});
+	
+	afterEach(function() {
+		document.body.removeChild(el);
+	});
+	
+	describe('#addListener', function() {
+		it('should add a listener and call it on event', function() {
+			var listener1 = jasmine.createSpy('listener1'), 
+				listener2 = jasmine.createSpy('listener2');
+		
+			L.DomEvent.addListener(el, 'click', listener1);
+			L.DomEvent.addListener(el, 'click', listener2);
+			
+			simulateClick(el);
+			
+			expect(listener1).toHaveBeenCalled();
+			expect(listener2).toHaveBeenCalled();
+		});
+		
+		it('should have "this" keyword point to the given context', function() {
+			var obj = {foo: 'bar'},
+				result;
+			
+			L.DomEvent.addListener(el, 'click', function() {
+				result = this;
+			}, obj);
+			
+			simulateClick(el);
+			
+			expect(result).toEqual(obj);
+		});
+		
+		it('should pass an event object to the listener', function() {
+			var type;
+			
+			L.DomEvent.addListener(el, 'click', function(e) {
+				type = e && e.type;
+			});
+			simulateClick(el);
+			
+			expect(type).toEqual('click');
+		});
+	});
+	
+	describe('#removeListener', function() {
+		it('should remove prevously added listener', function() {
+			var listener = jasmine.createSpy('listener');
+			
+			L.DomEvent.addListener(el, 'click', listener);
+			L.DomEvent.removeListener(el, 'click', listener);
+			
+			simulateClick(el);
+			
+			expect(listener).not.toHaveBeenCalled();
+		});
+	});
+	
+	describe('#stopPropagation', function() {
+		it('should stop propagation of the given event', function() {
+			var child = document.createElement('div'),
+				listener = jasmine.createSpy('listener');
+			
+			el.appendChild(child);
+			
+			L.DomEvent.addListener(child, 'click', L.DomEvent.stopPropagation);
+			L.DomEvent.addListener(el, 'click', listener);
+			
+			simulateClick(child);
+			
+			expect(listener).not.toHaveBeenCalled();
+			
+			el.removeChild(child);
+		});
+	});
+	describe('#preventDefault', function() {
+		it('should prevent the default action of event', function() {
+			L.DomEvent.addListener(el, 'click', L.DomEvent.preventDefault);
+
+			expect(simulateClick(el)).toBe(false);
+		});
+	});
 });

src/dom/DomEvent.js

@@ -6,9 +6,10 @@ L.DomEvent = {
 		/* inpired by John Resig, Dean Edwards and YUI addEvent implementations */
 		addListener: function(/*HTMLElement*/ obj, /*String*/ type, /*Function*/ fn, /*Object*/ context) {
 			var id = L.Util.stamp(fn);
-			obj['_leaflet_' + type + id] = function handler(e) {
+			function handler(e) {
 				return fn.call(context || obj, e || L.DomEvent._getEvent());
 			};
+			obj['_leaflet_' + type + id] = handler;
 			if ('addEventListener' in obj) {
 				if (type == 'mousewheel') {
 					obj.addEventListener('DOMMouseScroll', handler, false);