deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make sure that the teardown is called after all the handlers of a type are removed. Fixes #6065.

Browse source
This commit is contained in:
John Resig 2010-02-11 01:42:51 -05:00
parent 639f4931b0
commit 021b809ace
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/event.js
View file

@ -221,7 +221,7 @@ jQuery.event = {
} }
// remove generic event handler if no more handlers exist // 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 ) { if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
removeEvent( elem, type, elemData.handle ); removeEvent( elem, type, elemData.handle );
} }

8
test/unit/event.js
View file

@ -72,7 +72,7 @@ test("bind(), multiple events at once and namespaces", function() {
}); });
test("bind(), namespace with special add", function() { test("bind(), namespace with special add", function() {
expect(18); expect(19);
var div = jQuery("<div/>").bind("test", function(e) { var div = jQuery("<div/>").bind("test", function(e) {
ok( true, "Test event fired." ); 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." ); equals( e.target, div[0], "And that the target is correct." );
}, },
setup: function(){}, setup: function(){},
teardown: function(){}, teardown: function(){
ok(true, "Teardown called.");
},
add: function( handleObj ) { add: function( handleObj ) {
var handler = handleObj.handler; var handler = handleObj.handler;
handleObj.handler = function(e) { handleObj.handler = function(e) {
@ -116,6 +118,8 @@ test("bind(), namespace with special add", function() {
// Should trigger 2 // Should trigger 2
div.trigger("test.b"); div.trigger("test.b");
div.unbind("test");
}); });
test("bind(), no data", function() { test("bind(), no data", function() {