Merge branch 'release/4.2.7'

Olical · Dec 29, 2013 · 9554a8f · 9554a8f
2 parents 96cc268 + 85844f5
commit 9554a8f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/EventEmitter.js b/EventEmitter.js
@@ -1,5 +1,5 @@
 /*!
- * EventEmitter v4.2.6 - git.io/ee
+ * EventEmitter v4.2.7 - git.io/ee
  * Oliver Caldwell
  * MIT license
  * @preserve
@@ -69,7 +69,7 @@
 
 		// Return a concatenated array of all matching events if
 		// the selector is a regular expression.
-		if (typeof evt === 'object') {
+		if (evt instanceof RegExp) {
 			response = {};
 			for (key in events) {
 				if (events.hasOwnProperty(key) && evt.test(key)) {
@@ -322,7 +322,7 @@
 			// Remove all listeners for the specified event
 			delete events[evt];
 		}
-		else if (type === 'object') {
+		else if (evt instanceof RegExp) {
 			// Remove all events matching the regex.
 			for (key in events) {
 				if (events.hasOwnProperty(key) && evt.test(key)) {

diff --git a/EventEmitter.min.js b/EventEmitter.min.js
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
 	"name": "eventEmitter",
 	"description": "Event based JavaScript for the browser",
-	"version": "4.2.6",
+	"version": "4.2.7",
 	"main": [
 		"./EventEmitter.js"
 	],

diff --git a/component.json b/component.json
@@ -2,7 +2,7 @@
 	"name": "eventEmitter",
 	"repo": "Wolfy87/EventEmitter",
 	"description": "Event based JavaScript for the browser.",
-	"version": "4.2.6",
+	"version": "4.2.7",
 	"scripts": ["EventEmitter.js"],
 	"main": "EventEmitter.js",
 	"license": "MIT"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "wolfy87-eventemitter",
-	"version": "4.2.6",
+	"version": "4.2.7",
 	"description": "Event based JavaScript for the browser",
 	"main": "EventEmitter.js",
 	"directories": {