Browse Source

`newListener` emits correct fn when using `once`

Fixes #2826.
v0.9.1-release
Roly Fentanes 13 years ago
committed by koichik
parent
commit
db8940dae2
  1. 3
      lib/events.js
  2. 13
      test/simple/test-event-emitter-add-listeners.js

3
lib/events.js

@ -105,7 +105,8 @@ EventEmitter.prototype.addListener = function(type, listener) {
// To avoid recursion in the case that type == "newListeners"! Before // To avoid recursion in the case that type == "newListeners"! Before
// adding it to the listeners, first emit "newListeners". // adding it to the listeners, first emit "newListeners".
this.emit('newListener', type, listener); this.emit('newListener', type, typeof listener.listener === 'function' ?
listener.listener : listener);
if (!this._events[type]) { if (!this._events[type]) {
// Optimize the case of one listener. Don't need the extra array object. // Optimize the case of one listener. Don't need the extra array object.

13
test/simple/test-event-emitter-add-listeners.js

@ -26,6 +26,7 @@ var events = require('events');
var e = new events.EventEmitter(); var e = new events.EventEmitter();
var events_new_listener_emited = []; var events_new_listener_emited = [];
var listeners_new_listener_emited = [];
var times_hello_emited = 0; var times_hello_emited = 0;
// sanity check // sanity check
@ -34,14 +35,19 @@ assert.equal(e.addListener, e.on);
e.on('newListener', function(event, listener) { e.on('newListener', function(event, listener) {
console.log('newListener: ' + event); console.log('newListener: ' + event);
events_new_listener_emited.push(event); events_new_listener_emited.push(event);
listeners_new_listener_emited.push(listener);
}); });
e.on('hello', function(a, b) { function hello(a, b) {
console.log('hello'); console.log('hello');
times_hello_emited += 1; times_hello_emited += 1;
assert.equal('a', a); assert.equal('a', a);
assert.equal('b', b); assert.equal('b', b);
}); }
e.on('hello', hello);
var foo = function() {};
e.once('foo', foo);
console.log('start'); console.log('start');
@ -54,7 +60,8 @@ f.setMaxListeners(0);
process.on('exit', function() { process.on('exit', function() {
assert.deepEqual(['hello'], events_new_listener_emited); assert.deepEqual(['hello', 'foo'], events_new_listener_emited);
assert.deepEqual([hello, foo], listeners_new_listener_emited);
assert.equal(1, times_hello_emited); assert.equal(1, times_hello_emited);
}); });

Loading…
Cancel
Save