From: Brandon Aaron <brandon.aaron@gmail.com>
Date: Tue, 12 May 2009 15:43:51 +0000 (+0000)
Subject: fix regression in removing live events caused by r6324
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=b763cc6602fdf2bede16be5bf106ceaa1d1d0525;p=jquery.git

fix regression in removing live events caused by r6324
---

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 );
+					}
+				}
 			}
 		}
 	}