[fixup] remove hasListener in favour of listenerCount, document liste…

…ners change
nodejs · Nov 20, 2017 · b958ba3 · b958ba3
1 parent 88f0a14
commit b958ba3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/doc/api/events.md b/doc/api/events.md
@@ -344,16 +344,23 @@ added: v3.2.0
 
 Returns the number of listeners listening to the event named `eventName`.
 
-### emitter.listeners(eventName)
+### emitter.listeners(eventName[, unwrap])
 <!-- YAML
 added: v0.1.26
 changes:
   - version: v7.0.0
     pr-url: https://github.com/nodejs/node/pull/6881
     description: For listeners attached using `.once()` this returns the
                  original listeners instead of wrapper functions now.
+  - version: REPLACEME
+    pr-url: REPLACEME
+    description: Second optional argument `unwrap` allows the wrapped
+                 listeners to be returned (such as ones created with
+                 `.once()`)
 -->
-- `eventName` {any}
+* `eventName` {any} The name of the event.
+* `unwrap` {boolean} When set to true, will return the original listeners
+  instead of the wrapper functions created by `.once()`. **Default:** `true`
 
 Returns a copy of the array of listeners for the event named `eventName`.
 

diff --git a/lib/domain.js b/lib/domain.js
@@ -115,7 +115,7 @@ function setHasErrorListener(type) {
 }
 
 function removeHasErrorListener(type) {
-  if (type === 'error' && !this.hasListener('error'))
+  if (type === 'error' && !this.listenerCount('error'))
     this._hasErrorListener = false;
 }
 

diff --git a/lib/events.js b/lib/events.js
@@ -518,10 +518,6 @@ EventEmitter.prototype.eventNames = function eventNames() {
   return events !== undefined && events.size ? [...events.keys()] : [];
 };
 
-EventEmitter.prototype.hasListener = function hasListener(type) {
-  return this[kEvents] !== undefined && this[kEvents].has(type);
-};
-
 function arrayClone(arr) {
   const copy = new Array(arr.length);
   for (var i = 0; i < arr.length; ++i)

diff --git a/lib/vm.js b/lib/vm.js
@@ -44,15 +44,15 @@ const realRunInThisContext = Script.prototype.runInThisContext;
 const realRunInContext = Script.prototype.runInContext;
 
 Script.prototype.runInThisContext = function(options) {
-  if (options && options.breakOnSigint && process.hasListener('SIGINT')) {
+  if (options && options.breakOnSigint && process.listenerCount('SIGINT')) {
     return sigintHandlersWrap(realRunInThisContext, this, [options]);
   } else {
     return realRunInThisContext.call(this, options);
   }
 };
 
 Script.prototype.runInContext = function(contextifiedSandbox, options) {
-  if (options && options.breakOnSigint && process.hasListener('SIGINT')) {
+  if (options && options.breakOnSigint && process.listenerCount('SIGINT')) {
     return sigintHandlersWrap(realRunInContext, this,
                               [contextifiedSandbox, options]);
   } else {
@@ -83,8 +83,6 @@ function createScript(code, options) {
 // Remove all SIGINT listeners and re-attach them after the wrapped function
 // has executed, so that caught SIGINT are handled by the listeners again.
 function sigintHandlersWrap(fn, thisArg, argsArray) {
-  // Using the internal list here to make sure `.once()` wrappers are used,
-  // not the original ones.
   const sigintListeners = process.listeners('SIGINT', false);
 
   process.removeAllListeners('SIGINT');