[lib] wildcard bugfix

sequoiar · Jul 26, 2011 · 7fdc052 · 7fdc052
1 parent 4dd40d6
commit 7fdc052
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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();
   }