Skip to content

events: fix unwrapping of ee.once() listeners #5564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
omsmith wants to merge 3 commits into from
Closed

events: fix unwrapping of ee.once() listeners #5564

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f33eed3
events: fix 'removeListener' event after #once
omsmith Mar 4, 2016
3307c30
events: refactor listener unwrapping into function
omsmith Mar 4, 2016
3465da2
events: unwrap #once listeners in #listeners
omsmith Mar 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
events: unwrap #once listeners in #listeners
  • Loading branch information
@omsmith
omsmith committed Apr 11, 2016
commit 3465da2eba866d8d555ed833bded43293283ad39
12 changes: 10 additions & 2 deletions lib/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,9 @@ EventEmitter.prototype.listeners = function listeners(type) {
if (!evlistener)
ret = [];
else if (typeof evlistener === 'function')
ret = [evlistener];
ret = [unwrapListener(evlistener)];
else
ret = arrayClone(evlistener, evlistener.length);
ret = arrayMap(evlistener, unwrapListener);
}

return ret;
Expand Down Expand Up @@ -452,6 +452,14 @@ function arrayClone(arr, i) {
return copy;
}

function arrayMap(arr, fn) {
var ret = new Array(arr.length);
for (var i = 0; i < ret.length; ++i) {
ret[i] = fn(arr[i]);
}
return ret;
}

function unwrapListener(listener) {
return listener.listener ? listener.listener : listener;
}
9 changes: 9 additions & 0 deletions test/parallel/test-event-emitter-listeners.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,12 @@ var e3ListenersCopy = e3.listeners('foo');
e3.on('foo', listener2);
assert.deepEqual(e3.listeners('foo'), [listener, listener2]);
assert.deepEqual(e3ListenersCopy, [listener]);

var e4 = new events.EventEmitter();
e4.once('foo', listener);
assert.deepEqual(e4.listeners('foo'), [listener]);

var e5 = new events.EventEmitter();
e5.on('foo', listener);
e5.once('foo', listener2);
assert.deepEqual(e5.listeners('foo'), [listener, listener2]);