Skip to content
Permalink
Browse files

Make sure that the teardown is called after all the handlers of a typ…

…e are removed. Fixes #6065.
  • Loading branch information
jeresig committed Feb 11, 2010
1 parent 639f493 commit 021b809acecc4e94613375b3182c86722470fe9b
Showing with 7 additions and 3 deletions.
  1. +1 −1 src/event.js
  2. +6 −2 test/unit/event.js
@@ -221,7 +221,7 @@ jQuery.event = {
}

// remove generic event handler if no more handlers exist
if ( jQuery.isEmptyObject( events[ type ] ) ) {
if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
removeEvent( elem, type, elemData.handle );
}
@@ -72,7 +72,7 @@ test("bind(), multiple events at once and namespaces", function() {
});

test("bind(), namespace with special add", function() {
expect(18);
expect(19);

var div = jQuery("<div/>").bind("test", function(e) {
ok( true, "Test event fired." );
@@ -87,7 +87,9 @@ test("bind(), namespace with special add", function() {
equals( e.target, div[0], "And that the target is correct." );
},
setup: function(){},
teardown: function(){},
teardown: function(){
ok(true, "Teardown called.");
},
add: function( handleObj ) {
var handler = handleObj.handler;
handleObj.handler = function(e) {
@@ -116,6 +118,8 @@ test("bind(), namespace with special add", function() {

// Should trigger 2
div.trigger("test.b");

div.unbind("test");
});

test("bind(), no data", function() {

0 comments on commit 021b809

Please sign in to comment.
You can’t perform that action at this time.