Merge pull request #75 from natural-affinity/fix-event-context

fix: event callback context
flowjs · Jan 31, 2015 · 513eaa3 · 513eaa3
2 parents f9fbbb2 + bf51175
commit 513eaa3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/flow.js b/src/flow.js
@@ -199,7 +199,7 @@
       if (this.events.hasOwnProperty(event)) {
         each(this.events[event], function (callback) {
           preventDefault = callback.apply(this, args.slice(1)) === false || preventDefault;
-        });
+        }, this);
       }
       if (event != 'catchall') {
         args.unshift('catchAll');

diff --git a/test/eventsSpec.js b/test/eventsSpec.js
@@ -17,6 +17,15 @@ describe('events', function() {
     expect(valid).toBeTruthy();
   });
 
+  it('should have a context of flow instance', function() {
+    var context = null;
+    flow.on('test', function () {
+      context = this;
+    });
+    flow.fire('test');
+    expect(context).toEqual(flow);
+  });
+
   it('should pass some arguments', function() {
     var valid = false;
     var argumentOne = 123;
@@ -101,4 +110,4 @@ describe('events', function() {
       expect(event).not.toHaveBeenCalled();
     });
   });
-});
+});