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‎

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

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

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

681-
constevents=this._events;
682676
constlist=events[type];
677+
if(list===undefined)
678+
returnthis;
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
functionremoveAllListeners(type){
736-
if(!hasEventListener(this))
737-
returnthis;
738732
constevents=this._events;
733+
if(events===undefined)
734+
returnthis;
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+
constevents=target._events;
780+
781+
if(events===undefined)
784782
return[];
785783

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

788788
if(typeofevlistener==='function')
789789
returnunwrap ? [evlistener.listener||evlistener] : [evlistener];

0 commit comments

Comments
(0)