Fix delegateEvents + behavior bug

ashwinvemula · Jan 14, 2015 · 5543493 · 5543493
1 parent 4326f5c
commit 5543493
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/behaviors.js b/src/behaviors.js
@@ -35,12 +35,12 @@ Marionette.Behaviors = (function(Marionette, _) {
 
     behaviorEvents: function(behaviorEvents, behaviors) {
       var _behaviorsEvents = {};
-      var viewUI = _.result(this, 'ui');
+      var viewUI = this._uiBindings || _.result(this, 'ui');
 
       _.each(behaviors, function(b, i) {
         var _events = {};
         var behaviorEvents = _.clone(_.result(b, 'events')) || {};
-        var behaviorUI = _.result(b, 'ui');
+        var behaviorUI = b._uiBindings || _.result(b, 'ui');
 
         // Construct an internal UI hash first using
         // the views UI hash and then the behaviors UI hash.

diff --git a/test/unit/behaviors.spec.js b/test/unit/behaviors.spec.js
@@ -334,6 +334,12 @@ describe('Behaviors', function() {
         expect(this.behaviors.foo.prototype.events).to.have.property('click @ui.bar', 'onBarClick');
       });
 
+      it('should handle click events after calling delegateEvents', function() {
+        this.view.delegateEvents();
+        expect(this.fooBehavior.ui.foo.click.bind(this.view.ui.bar)).to.not.throw(Error);
+        expect(this.view.ui.bar.click.bind(this.view.ui.bar)).to.not.throw(Error);
+      });
+
       it('should set the behavior UI element', function() {
         expect(this.onRenderStub).to.have.been.calledOnce;
       });