Skip to content
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.

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

Use WeakSet for safe check #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions ev-emitter.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ proto.once = function( eventName, listener ) {
// set onceEvents hash
let onceEvents = this._onceEvents = this._onceEvents || {};
// set onceListeners object
let onceListeners = onceEvents[ eventName ] = onceEvents[ eventName ] || {};
onceEvents[ eventName ] = onceEvents[ eventName ] || new global.WeakSet();
// set flag
onceListeners[ listener ] = true;
onceEvents[ eventName ].add( listener );

return this;
};
Expand Down Expand Up @@ -74,13 +74,13 @@ proto.emitEvent = function( eventName, args ) {
let onceListeners = this._onceEvents && this._onceEvents[ eventName ];

for ( let listener of listeners ) {
let isOnce = onceListeners && onceListeners[ listener ];
let isOnce = onceListeners && onceListeners.has( listener );
if ( isOnce ) {
// remove listener
// remove before trigger to prevent recursion
this.off( eventName, listener );
// unset once flag
delete onceListeners[ listener ];
delete onceListeners.delete( listener );
}
// trigger listener
listener.apply( this, args );
Expand Down