X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=cac56bd6f75bc432d1f2a5441c5ecff05892269f;hb=739644dce5312fc66a37806ff5e07c8e9784f803;hp=e9164e594957480f79cdbd80c45df10e43c36aee;hpb=d0750727684cb17a762ee338132159e389920799;p=jquery.git

diff --git a/src/event.js b/src/event.js
index e9164e5..cac56bd 100644
--- a/src/event.js
+++ b/src/event.js
@@ -402,8 +402,20 @@ jQuery.event = {
 				jQuery.event.add( this, data.live, liveHandler );
 			},
 
-			teardown: function( namespaces ) {
-				jQuery.event.remove( this, namespaces[0], liveHandler );
+			remove: function( namespaces ) {
+				if ( namespaces.length ) {
+					var remove = 0, name = new RegExp("(^|\\.)" + namespaces[0] + "(\\.|$)");
+
+					jQuery.each( (jQuery.data(this, "events").live || {}), function() {
+						if ( name.test(this.type) ) {
+							remove++;
+						}
+					});
+
+					if ( remove < 1 ) {
+						jQuery.event.remove( this, namespaces[0], liveHandler );
+					}
+				}
 			}
 		}
 	}