Fix own EventEmitter.

petersirka · petersirka · commit f3c72ab90363 · 2017-03-26T19:40:08.000+02:00
diff --git a/index.js b/index.js
@@ -854,7 +854,10 @@ F.removeListener = function(name, fn) {
 };
 
 F.removeAllListeners = function(name) {
-	F.$events[name] = undefined;
+	if (name)
+		F.$events[name] = undefined;
+	else
+		F.$events = {};
 	return F;
 };
 
@@ -6593,10 +6596,10 @@ F.initialize = function(http, debug, options, restart) {
 
 		Object.keys(F.connections).forEach(function(key) {
 			var item = F.connections[key];
-			if (!item)
-				return;
-			item.removeAllListeners();
-			item.close();
+			if (item) {
+				item.removeAllListeners();
+				item.close();
+			}
 		});
 
 		F.server.close();
@@ -13369,7 +13372,10 @@ WebSocket.prototype.removeListener = function(name, fn) {
 };
 
 WebSocket.prototype.removeAllListeners = function(name) {
-	this.$events[name] = undefined;
+	if (name)
+		this.$events[name] = undefined;
+	else
+		this.$events = {};
 	return this;
 };
 
@@ -13612,8 +13618,8 @@ WebSocket.prototype.destroy = function(problem) {
 			var conn = self.connections[key];
 			if (conn) {
 				conn._isClosed = true;
-				conn.socket.removeAllListeners();
 				conn.removeAllListeners();
+				conn.socket.removeAllListeners();
 			}
 		});
 
diff --git a/mail.js b/mail.js
@@ -103,7 +103,10 @@ Mailer.prototype.removeListener = function(name, fn) {
 };
 
 Mailer.prototype.removeAllListeners = function(name) {
-	this.$events[name] = undefined;
+	if (name)
+		this.$events[name] = undefined;
+	else
+		this.$events = {};
 	return this;
 };
 
diff --git a/nosql.js b/nosql.js
@@ -125,7 +125,10 @@ Database.prototype.removeListener = function(name, fn) {
 };
 
 Database.prototype.removeAllListeners = function(name) {
-	this.$events[name] = undefined;
+	if (name)
+		this.$events[name] = undefined;
+	else
+		this.$events[name] = {};
 	return this;
 };
 
@@ -1868,7 +1871,10 @@ Counter.prototype.removeListener = function(name, fn) {
 };
 
 Counter.prototype.removeAllListeners = function(name) {
-	this.$events[name] = undefined;
+	if (name)
+		this.$events[name] = undefined;
+	else
+		this.$events = {};
 	return this;
 };
 
@@ -2318,7 +2324,10 @@ Binary.prototype.removeListener = function(name, fn) {
 };
 
 Binary.prototype.removeAllListeners = function(name) {
-	this.$events[name] = undefined;
+	if (name)
+		this.$events[name] = undefined;
+	else
+		this.$events = {};
 	return this;
 };
 
diff --git a/utils.js b/utils.js
@@ -5338,7 +5338,10 @@ EventEmitter2.prototype.removeListener = function(name, fn) {
 };
 
 EventEmitter2.prototype.removeAllListeners = function(name) {
-	this.$events[name] = undefined;
+	if (name)
+		this.$events[name] = undefined;
+	else
+		this.$events = {};
 	return this;
 };
 
