mirror of https://github.com/nodejs/node.git
Revert "events: add hasEventListener util for validate"
This reverts commit https://github.com/nodejs/node/commit/bdb6d12. PR-URL: https://github.com/nodejs/node/pull/56282 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Jason Zhang <xzha4350@gmail.com> Reviewed-By: Jake Yuesong Li <jake.yuesong@gmail.com>
This commit is contained in:
parent
c1627e9d19
commit
db83d2f0ee
|
@ -276,12 +276,6 @@ ObjectDefineProperty(EventEmitter, 'defaultMaxListeners', {
|
|||
},
|
||||
});
|
||||
|
||||
function hasEventListener(self, type) {
|
||||
if (type === undefined)
|
||||
return self._events !== undefined;
|
||||
return self._events !== undefined && self._events[type] !== undefined;
|
||||
};
|
||||
|
||||
ObjectDefineProperties(EventEmitter, {
|
||||
kMaxEventTargetListeners: {
|
||||
__proto__: null,
|
||||
|
@ -675,11 +669,13 @@ EventEmitter.prototype.removeListener =
|
|||
function removeListener(type, listener) {
|
||||
checkListener(listener);
|
||||
|
||||
if (!hasEventListener(this, type))
|
||||
const events = this._events;
|
||||
if (events === undefined)
|
||||
return this;
|
||||
|
||||
const events = this._events;
|
||||
const list = events[type];
|
||||
if (list === undefined)
|
||||
return this;
|
||||
|
||||
if (list === listener || list.listener === listener) {
|
||||
this._eventsCount -= 1;
|
||||
|
@ -733,9 +729,9 @@ EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
|
|||
*/
|
||||
EventEmitter.prototype.removeAllListeners =
|
||||
function removeAllListeners(type) {
|
||||
if (!hasEventListener(this))
|
||||
return this;
|
||||
const events = this._events;
|
||||
if (events === undefined)
|
||||
return this;
|
||||
|
||||
// Not listening for removeListener, no need to emit
|
||||
if (events.removeListener === undefined) {
|
||||
|
@ -780,10 +776,14 @@ EventEmitter.prototype.removeAllListeners =
|
|||
};
|
||||
|
||||
function _listeners(target, type, unwrap) {
|
||||
if (!hasEventListener(target, type))
|
||||
const events = target._events;
|
||||
|
||||
if (events === undefined)
|
||||
return [];
|
||||
|
||||
const evlistener = target._events[type];
|
||||
const evlistener = events[type];
|
||||
if (evlistener === undefined)
|
||||
return [];
|
||||
|
||||
if (typeof evlistener === 'function')
|
||||
return unwrap ? [evlistener.listener || evlistener] : [evlistener];
|
||||
|
|
Loading…
Reference in New Issue