From 7fdc052b3d45044a60388001f0efcee04a25287b Mon Sep 17 00:00:00 2001 From: hij1nx Date: Tue, 26 Jul 2011 14:04:40 -0700 Subject: [PATCH] [lib] wildcard bugfix --- lib/eventemitter2.js | 9 ++++----- test/wildcardEvents/addListener.js | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/eventemitter2.js b/lib/eventemitter2.js index 81637f2d..f33e4a29 100644 --- a/lib/eventemitter2.js +++ b/lib/eventemitter2.js @@ -52,9 +52,8 @@ } } - if(tree && (type[i] === '*' || tree[type[i]])) { - - if(type[i] === '*') { + if(tree && (type[i] === '*' || tree[type[i]] || tree['*'])) { + if(type[i] === '*' || tree['*']) { for(var branch in tree) { if(tree.hasOwnProperty(branch)) { listeners = searchListenerTree(handlers, type, tree[branch], i+1); @@ -81,7 +80,7 @@ }; var growListenerTree = function(type, listener) { - + var d = this.delimiter; if (type.charAt(0) === d || @@ -98,7 +97,7 @@ while (name) { if (!tree[name]) { - tree[name] = new Object(); + tree[name] = new Object; } tree = tree[name]; diff --git a/test/wildcardEvents/addListener.js b/test/wildcardEvents/addListener.js index 5882e2d4..2d12ccfe 100644 --- a/test/wildcardEvents/addListener.js +++ b/test/wildcardEvents/addListener.js @@ -144,14 +144,13 @@ module.exports = simpleEvents({ var emitter = this.emitter; var type = '*.*'; var f = function () { - text.ok(true, 'the event was fired') + test.ok(true, 'the event was fired') }; emitter.on(type, f); - console.log(emitter._events) emitter.emit('foo.foo'); - test.expect(2); + test.expect(1); test.done(); }