Remove addListener/removeListener

This commit is contained in:
Daniel Imms
2016-12-31 07:10:45 -08:00
parent 937cf43e09
commit 0d9d3aca1a
2 changed files with 8 additions and 18 deletions
+6 -6
View File
@@ -56,26 +56,26 @@ describe('EventEmitter', () => {
it('should return listeners for the type requested', () => { it('should return listeners for the type requested', () => {
assert.equal(eventEmitter.listeners('test').length, 0); assert.equal(eventEmitter.listeners('test').length, 0);
const listener = () => {}; const listener = () => {};
eventEmitter.addListener('test', listener); eventEmitter.on('test', listener);
assert.deepEqual(eventEmitter.listeners('test'), [listener]); assert.deepEqual(eventEmitter.listeners('test'), [listener]);
}); });
}); });
describe('removeListener', () => { describe('off', () => {
it('should remove the specific listener', () => { it('should remove the specific listener', () => {
const listener1 = () => {}; const listener1 = () => {};
const listener2 = () => {}; const listener2 = () => {};
eventEmitter.addListener('foo', listener1); eventEmitter.on('foo', listener1);
eventEmitter.addListener('foo', listener2); eventEmitter.on('foo', listener2);
assert.equal(eventEmitter.listeners('foo').length, 2); assert.equal(eventEmitter.listeners('foo').length, 2);
eventEmitter.removeListener('foo', listener1); eventEmitter.off('foo', listener1);
assert.deepEqual(eventEmitter.listeners('foo'), [listener2]); assert.deepEqual(eventEmitter.listeners('foo'), [listener2]);
}); });
}); });
describe('removeAllListeners', () => { describe('removeAllListeners', () => {
it('should clear all listeners', () => { it('should clear all listeners', () => {
eventEmitter.addListener('foo', () => {}); eventEmitter.on('foo', () => {});
assert.equal(eventEmitter.listeners('foo').length, 1); assert.equal(eventEmitter.listeners('foo').length, 1);
eventEmitter.removeAllListeners('foo'); eventEmitter.removeAllListeners('foo');
assert.equal(eventEmitter.listeners('foo').length, 0); assert.equal(eventEmitter.listeners('foo').length, 0);
+2 -12
View File
@@ -14,18 +14,12 @@ export class EventEmitter {
this._events = {}; this._events = {};
} }
// TODO: Merge addListener and on, no reason for an alias in a private component public on(type, listener): void {
public addListener(type, listener): void {
this._events[type] = this._events[type] || []; this._events[type] = this._events[type] || [];
this._events[type].push(listener); this._events[type].push(listener);
} }
public on(type, listener): void { public off(type, listener): void {
this.addListener(type, listener);
}
// TODO: Merge removeListener and off, no reason for an alias in a private component
public removeListener(type, listener): void {
if (!this._events[type]) { if (!this._events[type]) {
return; return;
} }
@@ -41,10 +35,6 @@ export class EventEmitter {
} }
} }
public off(type, listener): void {
this.removeListener(type, listener);
}
public removeAllListeners(type): void { public removeAllListeners(type): void {
if (this._events[type]) { if (this._events[type]) {
delete this._events[type]; delete this._events[type];