Events fire shortcut

This commit is contained in:
mourner 2010-09-10 16:54:20 +03:00
parent a8d55d0d47
commit 7cef8d3851
2 changed files with 11 additions and 5 deletions

View File

@ -66,14 +66,14 @@ describe('Events', function() {
}); });
}); });
describe('#on & #off', function() { describe('#on, #off & #fire', function() {
it('should work like #addEventListener && #removeEventListener', function() { it('should work like #addEventListener && #removeEventListener', function() {
var obj = new Klass(), var obj = new Klass(),
spy = jasmine.createSpy(); spy = jasmine.createSpy();
obj.on('test', spy); obj.on('test', spy);
obj.fireEvent('test'); obj.fire('test');
expect(spy).toHaveBeenCalled(); expect(spy).toHaveBeenCalled();
@ -85,12 +85,14 @@ describe('Events', function() {
it('should not override existing methods with the same name', function() { it('should not override existing methods with the same name', function() {
var spy1 = jasmine.createSpy(), var spy1 = jasmine.createSpy(),
spy2 = jasmine.createSpy(); spy2 = jasmine.createSpy(),
spy3 = jasmine.createSpy();
var Klass2 = L.Class.extend({ var Klass2 = L.Class.extend({
includes: L.Mixin.Events, includes: L.Mixin.Events,
on: spy1, on: spy1,
off: spy2 off: spy2,
fire: spy3
}); });
var obj = new Klass2(); var obj = new Klass2();
@ -100,6 +102,9 @@ describe('Events', function() {
obj.off(); obj.off();
expect(spy2).toHaveBeenCalled(); expect(spy2).toHaveBeenCalled();
obj.fire();
expect(spy3).toHaveBeenCalled();
}); });
}); });
}); });

View File

@ -50,3 +50,4 @@ L.Mixin.Events = {
L.Mixin.Events.on = L.Mixin.Events.addEventListener; L.Mixin.Events.on = L.Mixin.Events.addEventListener;
L.Mixin.Events.off = L.Mixin.Events.removeEventListener; L.Mixin.Events.off = L.Mixin.Events.removeEventListener;
L.Mixin.Events.fire = L.Mixin.Events.fireEvent;