Merge branch 'release/4.2.3'

EventEmitter.js

@@ -1,5 +1,5 @@
 /*!
- * EventEmitter v4.2.2 - git.io/ee
+ * EventEmitter v4.2.3 - git.io/ee
  * Oliver Caldwell
  * MIT license
  * @preserve
@@ -365,8 +365,14 @@
 					// If the listener returns true then it shall be removed from the event
 					// The function is executed either with a basic call or an apply if there is an args array
 					listener = listeners[key][i];
+
+					if (listener.once === true) {
+						this.removeListener(evt, listener.listener);
+					}
+
 					response = listener.listener.apply(this, args || []);
-					if (response === this._getOnceReturnValue() || listener.once === true) {
+
+					if (response === this._getOnceReturnValue()) {
 						this.removeListener(evt, listener.listener);
 					}
 				}

bower.json

@@ -1,7 +1,7 @@
 {
 	"name": "eventEmitter",
 	"description": "Event based JavaScript for the browser",
-	"version": "4.2.2",
+	"version": "4.2.3",
 	"main": [
 		"./EventEmitter.js"
 	],

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wolfy87-eventemitter",
-	"version": "4.2.2",
+	"version": "4.2.3",
 	"description": "Event based JavaScript for the browser",
 	"main": "EventEmitter.js",
 	"directories": {

tests/tests.js

@@ -152,6 +152,15 @@
 			ee.removeListener('foo', fn1);
 			assert.deepEqual(ee.flattenListeners(ee.getListeners('foo')), []);
 		});
+
+		test('can not cause infinite recursion', function () {
+			ee.addOnceListener('foo', function() {
+				counter += 1;
+				this.emitEvent('foo');
+			});
+			ee.trigger('foo');
+			assert.strictEqual(counter, 1);
+		});
 	});
 
 	suite('removeListener', function() {