Merge branch '8777' of https://github.com/rwldrn/jquery into rwldrn-8777

Conflicts: src/event.js
jquery · Apr 11, 2011 · 094c48e · 094c48e
2 parents 868e1e2 + 4b0c26f
commit 094c48e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/src/event.js b/src/event.js
@@ -1033,6 +1033,14 @@ jQuery.each(["live", "die"], function( i, name ) {
 			return this;
 		}
 
+		if ( name === "die" && !types &&
+					origSelector && origSelector[0] === "." ) {
+
+			context.unbind( origSelector );
+
+			return this;
+		}
+
 		if ( data === false || jQuery.isFunction( data ) ) {
 			fn = data || returnFalse;
 			data = undefined;

diff --git a/test/unit/event.js b/test/unit/event.js
@@ -2022,6 +2022,27 @@ test("delegate with submit", function() {
 	jQuery(document).undelegate();
 });
 
+test("undelegate() with only namespaces", function(){
+	expect(2);
+
+	var $delegate = jQuery("#liveHandlerOrder"),
+			count = 0;
+
+	$delegate.delegate("a", "click.ns", function(e) {
+		count++;
+	});
+
+	jQuery("a", $delegate).eq(0).trigger("click.ns");
+
+	equals( count, 1, "delegated click.ns");
+
+	$delegate.undelegate(".ns");
+
+	jQuery("a", $delegate).eq(1).trigger("click.ns");
+
+	equals( count, 1, "no more .ns after undelegate");
+});
+
 test("Non DOM element events", function() {
 	expect(1);