Skip to content

Commit db83d2f

Browse files
origranotaduh95
authored andcommitted
Revert "events: add hasEventListener util for validate"
This reverts commit bdb6d12. PR-URL: #56282 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Jason Zhang <[email protected]> Reviewed-By: Jake Yuesong Li <[email protected]>
1 parent c1627e9 commit db83d2f

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

lib/events.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,6 @@ ObjectDefineProperty(EventEmitter, 'defaultMaxListeners', {
276276
},
277277
});
278278

279-
function hasEventListener(self, type) {
280-
if (type === undefined)
281-
return self._events !== undefined;
282-
return self._events !== undefined && self._events[type] !== undefined;
283-
};
284-
285279
ObjectDefineProperties(EventEmitter, {
286280
kMaxEventTargetListeners: {
287281
__proto__: null,
@@ -675,11 +669,13 @@ EventEmitter.prototype.removeListener =
675669
function removeListener(type, listener) {
676670
checkListener(listener);
677671

678-
if (!hasEventListener(this, type))
672+
const events = this._events;
673+
if (events === undefined)
679674
return this;
680675

681-
const events = this._events;
682676
const list = events[type];
677+
if (list === undefined)
678+
return this;
683679

684680
if (list === listener || list.listener === listener) {
685681
this._eventsCount -= 1;
@@ -733,9 +729,9 @@ EventEmitter.prototype.off = EventEmitter.prototype.removeListener;
733729
*/
734730
EventEmitter.prototype.removeAllListeners =
735731
function removeAllListeners(type) {
736-
if (!hasEventListener(this))
737-
return this;
738732
const events = this._events;
733+
if (events === undefined)
734+
return this;
739735

740736
// Not listening for removeListener, no need to emit
741737
if (events.removeListener === undefined) {
@@ -780,10 +776,14 @@ EventEmitter.prototype.removeAllListeners =
780776
};
781777

782778
function _listeners(target, type, unwrap) {
783-
if (!hasEventListener(target, type))
779+
const events = target._events;
780+
781+
if (events === undefined)
784782
return [];
785783

786-
const evlistener = target._events[type];
784+
const evlistener = events[type];
785+
if (evlistener === undefined)
786+
return [];
787787

788788
if (typeof evlistener === 'function')
789789
return unwrap ? [evlistener.listener || evlistener] : [evlistener];

0 commit comments

Comments
 (0)