Make sure that elements that have been removed also have their special events cleaned up. Fixes #6084.

src/event.js

@@ -112,6 +112,10 @@ jQuery.event = {
 			
 			if ( special.add ) { 
 				special.add.call( elem, handleObj ); 
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
 			}
 
 			// Add the function to the element's handler list

src/manipulation.js

@@ -547,7 +547,7 @@ jQuery.extend({
 	},
 	
 	cleanData: function( elems ) {
-		var data, id, cache = jQuery.cache;
+		var data, id, cache = jQuery.cache, special = jQuery.event.special;
 		
 		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
 			id = elem[ jQuery.expando ];
@@ -556,8 +556,13 @@ jQuery.extend({
 				data = cache[ id ];
 				
 				if ( data.events ) {
-					for ( var event in data.events ) {
+					for ( var type in data.events ) {
-						removeEvent( elem, event, data.handle );
+						if ( special[ type ] ) {
+							jQuery.event.remove( elem, type );
+
+						} else {
+							removeEvent( elem, type, data.handle );
+						}
 					}
 				}
 				

test/unit/event.js

@@ -72,7 +72,7 @@ test("bind(), multiple events at once and namespaces", function() {
 });
 
 test("bind(), namespace with special add", function() {
-	expect(19);
+	expect(24);
 
 	var div = jQuery("<div/>").bind("test", function(e) {
 		ok( true, "Test event fired." );
@@ -97,7 +97,9 @@ test("bind(), namespace with special add", function() {
 				handler.apply( this, arguments );
 			};
 		},
-		remove: function() {}
+		remove: function() {
+			ok(true, "Remove called.");
+		}
 	};
 
 	div.bind("test.a", {x: 1}, function(e) {
@@ -119,7 +121,17 @@ test("bind(), namespace with special add", function() {
 	// Should trigger 2
 	div.trigger("test.b");
 
+	// Should trigger 4
 	div.unbind("test");
+
+	div = jQuery("<div/>").bind("test", function(e) {
+		ok( true, "Test event fired." );
+	});
+
+	// Should trigger 2
+	div.appendTo("#main").remove();
+
+	delete jQuery.event.special.test;
 });
 
 test("bind(), no data", function() {