1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

events: removeListener add checks and cleanup

Browse Source 
Remove unecessary splice for single listener events. Add type check for
"type" argument.
This commit is contained in:
Trevor Norris 2013-02-20 23:54:38 -08:00 committed by isaacs
parent aba03ebb5a
commit b3ea8443bd
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/events.js
View File

@ -203,42 +203,47 @@ EventEmitter.prototype.once = function(type, listener) {
// emits a 'removeListener' event iff the listener was removed
EventEmitter.prototype.removeListener = function(type, listener) {
if ('function' !== typeof listener) {
throw TypeError('removeListener only takes instances of Function');
}
var list, position, length, i;
// does not use listeners(), so no side effect of creating _events[type]
if (!this._events || !this._events[type]) return this;
if (typeof type !== 'string')
throw TypeError('type must be a string');
if (typeof listener !== 'function')
throw TypeError('listener must be a function');
var list = this._events[type];
if (!this._events || !this._events[type])
return this;
if (isArray(list)) {
var position = -1;
for (var i = 0, length = list.length; i < length; i++) {
list = this._events[type];
length = list.length;
position = -1;
if (list === listener ||
(typeof list.listener === 'function' && list.listener === listener)) {
this._events[type] = null;
if (this._events.removeListener)
this.emit('removeListener', type, listener);
} else if (isArray(list)) {
for (i = 0; i < length; i++) {
if (list[i] === listener ||
(list[i].listener && list[i].listener === listener))
{
(list[i].listener && list[i].listener === listener)) {
position = i;
break;
}
}
if (position < 0) return this;
list.splice(position, 1);
if (list.length == 0)
if (position < 0)
return this;
if (list.length === 1) {
list.length = 0;
this._events[type] = null;
if (this._events.removeListener) {
this.emit('removeListener', type, listener);
} else {
list.splice(position, 1);
}
} else if (list === listener ||
(list.listener && list.listener === listener))
{
this._events[type] = null;
if (this._events.removeListener) {
if (this._events.removeListener)
this.emit('removeListener', type, listener);
}
}
return this;