Unbind collection and model events for behaviors

mxriverlynn · Apr 18, 2014 · c68c1ab · c68c1ab
1 parent 2d9ad15
commit c68c1ab
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/spec/javascripts/behaviors.spec.js b/spec/javascripts/behaviors.spec.js
@@ -413,6 +413,25 @@ describe("Behaviors", function(){
       expect(collectionSpy).toHaveBeenCalledOn(testBehavior);
     });
 
+    it("should unbind model events on view undelegate", function() {
+      v = new V({
+        model: m
+      });
+
+      v.undelegateEvents();
+      m.set("foo", "doge");
+      expect(fooChangedSpy).not.toHaveBeenCalled();
+    });
+
+    it("should unbind collection events on view undelegate", function() {
+      v = new CV({
+        collection: c
+      });
+
+      v.undelegateEvents();
+      c.reset();
+      expect(collectionSpy).not.toHaveBeenCalled();
+    });
   });
 
   describe("behavior trigger calls", function() {

diff --git a/src/marionette.behaviors.js b/src/marionette.behaviors.js
@@ -96,8 +96,8 @@ Marionette.Behaviors = (function(Marionette, _) {
       undelegateEvents.apply(this, args);
 
       _.each(behaviors, function(b) {
-        Marionette.unbindEntityEvents(this, this.model, Marionette.getOption(b, "modelEvents"));
-        Marionette.unbindEntityEvents(this, this.collection, Marionette.getOption(b, "collectionEvents"));
+        Marionette.unbindEntityEvents(b, this.model, Marionette.getOption(b, "modelEvents"));
+        Marionette.unbindEntityEvents(b, this.collection, Marionette.getOption(b, "collectionEvents"));
       }, this);
     },