X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=2937b1c02475f56e3d7de18ed3c262369398300e;hb=104757705a19df3b6b9750aaef30aa451082f825;hp=e2ed0e3db99cb9def57952fbd9db847e9e9fc532;hpb=6e5a6a26a7d802b3abdc32d3b49f4936d1f63cd7;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index e2ed0e3..2937b1c 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -37,6 +37,87 @@ test("bind(), multiple events at once", function() {
 	equals( mouseoverCounter, 1, "bind() with multiple events at once" );
 });
 
+test("bind(), multiple events at once and namespaces", function() {
+	expect(7);
+
+	var cur, obj = {};
+
+	var div = jQuery("<div/>").bind("focusin.a", function(e) {
+		equals( e.type, cur, "Verify right single event was fired." );
+	});
+
+	cur = "focusin";
+	div.trigger("focusin.a");
+
+	div = jQuery("<div/>").bind("click mouseover", obj, function(e) {
+		equals( e.type, cur, "Verify right multi event was fired." );
+		equals( e.data, obj, "Make sure the data came in correctly." );
+	});
+
+	cur = "click";
+	div.trigger("click");
+
+	cur = "mouseover";
+	div.trigger("mouseover");
+
+	div = jQuery("<div/>").bind("focusin.a focusout.b", function(e) {
+		equals( e.type, cur, "Verify right multi event was fired." );
+	});
+
+	cur = "focusin";
+	div.trigger("focusin.a");
+
+	cur = "focusout";
+	div.trigger("focusout.b");
+});
+
+test("bind(), namespace with special add", function() {
+	expect(18);
+
+	var div = jQuery("<div/>").bind("test", function(e) {
+		ok( true, "Test event fired." );
+	});
+
+	var i = 0;
+
+	jQuery.event.special.test = {
+		_default: function(e) {
+			equals( this, document, "Make sure we're at the top of the chain." );
+			equals( e.type, "test", "And that we're still dealing with a test event." );
+			equals( e.target, div[0], "And that the target is correct." );
+		},
+		setup: function(){},
+		teardown: function(){},
+		add: function( handleObj ) {
+			var handler = handleObj.handler;
+			handleObj.handler = function(e) {
+				e.xyz = ++i;
+				handler.apply( this, arguments );
+			};
+		},
+		remove: function() {}
+	};
+
+	div.bind("test.a", {x: 1}, function(e) {
+		ok( !!e.xyz, "Make sure that the data is getting passed through." );
+		equals( e.data.x, 1, "Make sure data is attached properly." );
+	});
+
+	div.bind("test.b", {x: 2}, function(e) {
+		ok( !!e.xyz, "Make sure that the data is getting passed through." );
+		equals( e.data.x, 2, "Make sure data is attached properly." );
+	});
+
+	// Should trigger 5
+	div.trigger("test");
+
+	// Should trigger 2
+	div.trigger("test.a");
+
+	// Should trigger 2
+	div.trigger("test.b");
+});
+
 test("bind(), no data", function() {
 	expect(1);
 	var handler = function(event) {
@@ -219,6 +300,44 @@ test("bind(), multi-namespaced events", function() {
 	jQuery("#firstp").trigger("custom");
 });
 
+test("bind(), with same function", function() {
+	expect(2)
+
+	var count = 0 ,  func = function(){
+		count++;
+	};
+
+	jQuery("#liveHandlerOrder").bind("foo.bar", func).bind("foo.zar", func);
+	jQuery("#liveHandlerOrder").trigger("foo.bar");
+
+	equals(count, 1, "Verify binding function with multiple namespaces." );
+
+	jQuery("#liveHandlerOrder").unbind("foo.bar", func).unbind("foo.zar", func);
+	jQuery("#liveHandlerOrder").trigger("foo.bar");
+
+	equals(count, 1, "Verify that removing events still work." );
+});
+
+test("bind(), make sure order is maintained", function() {
+	expect(1);
+
+	var elem = jQuery("#firstp"), log = [], check = [];
+
+	for ( var i = 0; i < 100; i++ ) (function(i){
+		elem.bind( "click", function(){
+			log.push( i );
+		});
+
+		check.push( i );
+	})(i);
+
+	elem.trigger("click");
+
+	equals( log.join(","), check.join(","), "Make sure order was maintained." );
+
+	elem.unbind("click");
+});
+ 
 test("bind(), with different this object", function() {
 	expect(4);
 	var thisObject = { myThis: true },
@@ -232,8 +351,8 @@ test("bind(), with different this object", function() {
 		};
 	
 	jQuery("#firstp")
-		.bind("click", handler1, thisObject).click().unbind("click", handler1)
-		.bind("click", data, handler2, thisObject).click().unbind("click", handler2);
+		.bind("click", jQuery.proxy(handler1, thisObject)).click().unbind("click", handler1)
+		.bind("click", data, jQuery.proxy(handler2, thisObject)).click().unbind("click", handler2);
 
 	ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data." );
 });
@@ -394,7 +513,7 @@ test("trigger() bubbling", function() {
 });
 
 test("trigger(type, [data], [fn])", function() {
-	expect(12);
+	expect(14);
 
 	var handler = function(event, a, b, c) {
 		equals( event.type, "click", "check passed data" );
@@ -439,6 +558,34 @@ test("trigger(type, [data], [fn])", function() {
 		pass = false;
 	}
 	ok( pass, "Trigger on a table with a colon in the even type, see #3533" );
+
+	var form = jQuery("<form action=''></form>").appendTo("body");
+
+	// Make sure it can be prevented locally
+	form.submit(function(){
+		ok( true, "Local bind still works." );
+		return false;
+	});
+
+	// Trigger 1
+	form.trigger("submit");
+
+	form.unbind("submit");
+
+	jQuery(document).submit(function(){
+		ok( true, "Make sure bubble works up to document." );
+		return false;
+	});
+
+	// Trigger 1
+	form.trigger("submit");
+
+	jQuery(document).unbind("submit");
+
+	form.remove();
+});
+
+test("jQuery.Event.currentTarget", function(){
 });
 
 test("trigger(eventObject, [data], [fn])", function() {
@@ -608,7 +755,7 @@ test("toggle(Function, Function, ...)", function() {
 });
 
 test(".live()/.die()", function() {
-	expect(58);
+	expect(65);
 
 	var submit = 0, div = 0, livea = 0, liveb = 0;
 
@@ -675,6 +822,13 @@ test(".live()/.die()", function() {
 	equals( livea, 6, "stopPropagation Click on inner div" );
 	equals( liveb, 3, "stopPropagation Click on inner div" );
 
+	// Make sure click events only fire with primary click
+	var event = jQuery.Event("click");
+	event.button = 1;
+	jQuery("div#nothiddendiv").trigger(event);
+
+	equals( livea, 6, "live secondary click" );
+
 	jQuery("div#nothiddendivchild").die("click");
 	jQuery("div#nothiddendiv").die("click");
 	jQuery("div").die("click");
@@ -706,15 +860,15 @@ test(".live()/.die()", function() {
 	jQuery("#foo").trigger("click", true).die("click");
 
 	// Test binding with different this object
-	jQuery("#foo").live("click", function(e){ equals( this.foo, "bar", "live with event scope" ); }, { foo: "bar" });
+	jQuery("#foo").live("click", jQuery.proxy(function(e){ equals( this.foo, "bar", "live with event scope" ); }, { foo: "bar" }));
 	jQuery("#foo").trigger("click").die("click");
 
 	// Test binding with different this object, event data, and trigger data
-	jQuery("#foo").live("click", true, function(e, data){
+	jQuery("#foo").live("click", true, jQuery.proxy(function(e, data){
 		equals( e.data, true, "live with with different this object, event data, and trigger data" );
 		equals( this.foo, "bar", "live with with different this object, event data, and trigger data" ); 
 		equals( data, true, "live with with different this object, event data, and trigger data")
-	}, { foo: "bar" });
+	}, { foo: "bar" }));
 	jQuery("#foo").trigger("click", true).die("click");
 
 	// Verify that return false prevents default action
@@ -796,8 +950,8 @@ test(".live()/.die()", function() {
 	equals( livee, 0, "Verify that second handler doesn't." );
 
 	// and one pair in inverse
-	jQuery('#liveHandlerOrder span#liveSpan2').live('click', function(){ livee++; });
-	jQuery('#liveHandlerOrder span#liveSpan2 a').live('click', function(){ lived++; return false; });
+	jQuery('span#liveSpan2').live('click', function(){ livee++; });
+	jQuery('span#liveSpan2 a').live('click', function(){ lived++; return false; });
 
 	lived = 0;
 	livee = 0;
@@ -806,7 +960,10 @@ test(".live()/.die()", function() {
 	equals( livee, 0, "Verify that second handler doesn't." );
 	
 	// Cleanup
-	jQuery("span#liveSpan1 a, span#liveSpan1, span#liveSpan2 a, span#liveSpan2").die("click");
+	jQuery("span#liveSpan1 a").die("click")
+	jQuery("span#liveSpan1").die("click");
+	jQuery("span#liveSpan2 a").die("click");
+	jQuery("span#liveSpan2").die("click");
 	
 	// Test this, target and currentTarget are correct
 	jQuery('span#liveSpan1').live('click', function(e){ 
@@ -818,59 +975,606 @@ test(".live()/.die()", function() {
 	jQuery('span#liveSpan1 a').click();
 	
 	jQuery('span#liveSpan1').die('click');
+
+	// Work with deep selectors
+	livee = 0;
+
+	function clickB(){ livee++; }
+
+	jQuery("#nothiddendiv div").live("click", function(){ livee++; });
+	jQuery("#nothiddendiv div").live("click", clickB);
+	jQuery("#nothiddendiv div").live("mouseover", function(){ livee++; });
+
+	equals( livee, 0, "No clicks, deep selector." );
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("click");
+	equals( livee, 2, "Click, deep selector." );
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("mouseover");
+	equals( livee, 1, "Mouseover, deep selector." );
+
+	jQuery("#nothiddendiv div").die("mouseover");
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("click");
+	equals( livee, 2, "Click, deep selector." );
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("mouseover");
+	equals( livee, 0, "Mouseover, deep selector." );
+
+	jQuery("#nothiddendiv div").die("click", clickB);
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("click");
+	equals( livee, 1, "Click, deep selector." );
+
+	jQuery("#nothiddendiv div").die("click");
 });
 
-test("live with submit", function() {
+test("die all bound events", function(){
+	expect(1);
+
+	var count = 0;
+	var div = jQuery("div#nothiddendivchild");
+
+	div.live("click submit", function(){ count++; });
+	div.die();
+
+	div.trigger("click");
+	div.trigger("submit");
+
+	equals( count, 0, "Make sure no events were triggered." );
+});
+
+test("live with multiple events", function(){
+	expect(1);
+
 	var count = 0;
+	var div = jQuery("div#nothiddendivchild");
+
+	div.live("click submit", function(){ count++; });
+
+	div.trigger("click");
+	div.trigger("submit");
+
+	equals( count, 2, "Make sure both the click and submit were triggered." );
+});
+
+test("live with change", function(){
+	var selectChange = 0, checkboxChange = 0;
 	
-	jQuery("#testForm").live("submit", function() {
-		count++;
-		return false;
+	var select = jQuery("select[name='S1']")
+	select.live("change", function() {
+		selectChange++;
+	});
+	
+	var checkbox = jQuery("#check2"), 
+		checkboxFunction = function(){
+			checkboxChange++;
+		}
+	checkbox.live("change", checkboxFunction);
+	
+	// test click on select
+
+	// second click that changed it
+	selectChange = 0;
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 1, "Change on click." );
+	
+	// test keys on select
+	selectChange = 0;
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 1, "Change on keyup." );
+	
+	// test click on checkbox
+	checkbox.trigger("change");
+	equals( checkboxChange, 1, "Change on checkbox." );
+	
+	// test before activate on radio
+	
+	// test blur/focus on textarea
+	var textarea = jQuery("#area1"), textareaChange = 0, oldVal = textarea.val();
+	textarea.live("change", function() {
+		textareaChange++;
+	});
+
+	textarea.val(oldVal + "foo");
+	textarea.trigger("change");
+	equals( textareaChange, 1, "Change on textarea." );
+
+	textarea.val(oldVal);
+	textarea.die("change");
+	
+	// test blur/focus on text
+	var text = jQuery("#name"), textChange = 0, oldTextVal = text.val();
+	text.live("change", function() {
+		textChange++;
 	});
+
+	text.val(oldVal+"foo");
+	text.trigger("change");
+	equals( textChange, 1, "Change on text input." );
+
+	text.val(oldTextVal);
+	text.die("change");
+	
+	// test blur/focus on password
+	var password = jQuery("#name"), passwordChange = 0, oldPasswordVal = password.val();
+	password.live("change", function() {
+		passwordChange++;
+	});
+
+	password.val(oldPasswordVal + "foo");
+	password.trigger("change");
+	equals( passwordChange, 1, "Change on password input." );
+
+	password.val(oldPasswordVal);
+	password.die("change");
 	
-	jQuery("#testForm input[name=sub1]")[0].click();
-	jQuery("#testForm input[name=T1]").trigger({type: "keypress", keyCode: 13});
+	// make sure die works
 	
-	equals(2, count);
+	// die all changes
+	selectChange = 0;
+	select.die("change");
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 0, "Die on click works." );
+
+	selectChange = 0;
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 0, "Die on keyup works." );
+	
+	// die specific checkbox
+	checkbox.die("change", checkboxFunction);
+	checkbox.trigger("change");
+	equals( checkboxChange, 1, "Die on checkbox." );
+});
+
+test("live with submit", function() {
+	var count1 = 0, count2 = 0;
+	
+	jQuery("#testForm").live("submit", function(ev) {
+		count1++;
+		ev.preventDefault();
+	});
+
+	jQuery("body").live("submit", function(ev) {
+		count2++;
+		ev.preventDefault();
+	});
+
+	if ( jQuery.support.submitBubbles ) {
+		jQuery("#testForm input[name=sub1]")[0].click();
+		equals(count1,1 );
+		equals(count2,1);
+	} else {
+		jQuery("#testForm input[name=sub1]")[0].click();
+		jQuery("#testForm input[name=T1]").trigger({type: "keypress", keyCode: 13});
+		equals(count1,2);
+		equals(count2,2);
+	}
 	
 	jQuery("#testForm").die("submit");
+	jQuery("body").die("submit");
 });
 
-test("live with focus/blur", function(){
-	expect(2);
+test(".delegate()/.undelegate()", function() {
+	expect(65);
+
+	var submit = 0, div = 0, livea = 0, liveb = 0;
+
+	jQuery("#body").delegate("div", "submit", function(){ submit++; return false; });
+	jQuery("#body").delegate("div", "click", function(){ div++; });
+	jQuery("#body").delegate("div#nothiddendiv", "click", function(){ livea++; });
+	jQuery("#body").delegate("div#nothiddendivchild", "click", function(){ liveb++; });
+
+	// Nothing should trigger on the body
+	jQuery("body").trigger("click");
+	equals( submit, 0, "Click on body" );
+	equals( div, 0, "Click on body" );
+	equals( livea, 0, "Click on body" );
+	equals( liveb, 0, "Click on body" );
+
+	// This should trigger two events
+	jQuery("div#nothiddendiv").trigger("click");
+	equals( submit, 0, "Click on div" );
+	equals( div, 1, "Click on div" );
+	equals( livea, 1, "Click on div" );
+	equals( liveb, 0, "Click on div" );
+
+	// This should trigger three events (w/ bubbling)
+	jQuery("div#nothiddendivchild").trigger("click");
+	equals( submit, 0, "Click on inner div" );
+	equals( div, 2, "Click on inner div" );
+	equals( livea, 2, "Click on inner div" );
+	equals( liveb, 1, "Click on inner div" );
+
+	// This should trigger one submit
+	jQuery("div#nothiddendivchild").trigger("submit");
+	equals( submit, 1, "Submit on div" );
+	equals( div, 2, "Submit on div" );
+	equals( livea, 2, "Submit on div" );
+	equals( liveb, 1, "Submit on div" );
+
+	// Make sure no other events were removed in the process
+	jQuery("div#nothiddendivchild").trigger("click");
+	equals( submit, 1, "undelegate Click on inner div" );
+	equals( div, 3, "undelegate Click on inner div" );
+	equals( livea, 3, "undelegate Click on inner div" );
+	equals( liveb, 2, "undelegate Click on inner div" );
+
+	// Now make sure that the removal works
+	jQuery("#body").undelegate("div#nothiddendivchild", "click");
+	jQuery("div#nothiddendivchild").trigger("click");
+	equals( submit, 1, "undelegate Click on inner div" );
+	equals( div, 4, "undelegate Click on inner div" );
+	equals( livea, 4, "undelegate Click on inner div" );
+	equals( liveb, 2, "undelegate Click on inner div" );
+
+	// Make sure that the click wasn't removed too early
+	jQuery("div#nothiddendiv").trigger("click");
+	equals( submit, 1, "undelegate Click on inner div" );
+	equals( div, 5, "undelegate Click on inner div" );
+	equals( livea, 5, "undelegate Click on inner div" );
+	equals( liveb, 2, "undelegate Click on inner div" );
+
+	// Make sure that stopPropgation doesn't stop live events
+	jQuery("#body").delegate("div#nothiddendivchild", "click", function(e){ liveb++; e.stopPropagation(); });
+	jQuery("div#nothiddendivchild").trigger("click");
+	equals( submit, 1, "stopPropagation Click on inner div" );
+	equals( div, 6, "stopPropagation Click on inner div" );
+	equals( livea, 6, "stopPropagation Click on inner div" );
+	equals( liveb, 3, "stopPropagation Click on inner div" );
+
+	// Make sure click events only fire with primary click
+	var event = jQuery.Event("click");
+	event.button = 1;
+	jQuery("div#nothiddendiv").trigger(event);
+
+	equals( livea, 6, "delegate secondary click" );
+
+	jQuery("#body").undelegate("div#nothiddendivchild", "click");
+	jQuery("#body").undelegate("div#nothiddendiv", "click");
+	jQuery("#body").undelegate("div", "click");
+	jQuery("#body").undelegate("div", "submit");
+
+	// Test binding with a different context
+	var clicked = 0, container = jQuery('#main')[0];
+	jQuery("#main").delegate("#foo", "click", function(e){ clicked++; });
+	jQuery("div").trigger('click');
+	jQuery("#foo").trigger('click');
+	jQuery("#main").trigger('click');
+	jQuery("body").trigger('click');
+	equals( clicked, 2, "delegate with a context" );
+
+	// Make sure the event is actually stored on the context
+	ok( jQuery.data(container, "events").live, "delegate with a context" );
+
+	// Test unbinding with a different context
+	jQuery("#main").undelegate("#foo", "click");
+	jQuery("#foo").trigger('click');
+	equals( clicked, 2, "undelegate with a context");
+
+	// Test binding with event data
+	jQuery("#body").delegate("#foo", "click", true, function(e){ equals( e.data, true, "delegate with event data" ); });
+	jQuery("#foo").trigger("click");
+	jQuery("#body").undelegate("#foo", "click");
+
+	// Test binding with trigger data
+	jQuery("#body").delegate("#foo", "click", function(e, data){ equals( data, true, "delegate with trigger data" ); });
+	jQuery("#foo").trigger("click", true);
+	jQuery("#body").undelegate("#foo", "click");
+
+	// Test binding with different this object
+	jQuery("#body").delegate("#foo", "click", jQuery.proxy(function(e){ equals( this.foo, "bar", "delegate with event scope" ); }, { foo: "bar" }));
+	jQuery("#foo").trigger("click");
+	jQuery("#body").undelegate("#foo", "click");
+
+	// Test binding with different this object, event data, and trigger data
+	jQuery("#body").delegate("#foo", "click", true, jQuery.proxy(function(e, data){
+		equals( e.data, true, "delegate with with different this object, event data, and trigger data" );
+		equals( this.foo, "bar", "delegate with with different this object, event data, and trigger data" ); 
+		equals( data, true, "delegate with with different this object, event data, and trigger data")
+	}, { foo: "bar" }));
+	jQuery("#foo").trigger("click", true);
+	jQuery("#body").undelegate("#foo", "click");
+
+	// Verify that return false prevents default action
+	jQuery("#body").delegate("#anchor2", "click", function(){ return false; });
+	var hash = window.location.hash;
+	jQuery("#anchor2").trigger("click");
+	equals( window.location.hash, hash, "return false worked" );
+	jQuery("#body").undelegate("#anchor2", "click");
+
+	// Verify that .preventDefault() prevents default action
+	jQuery("#body").delegate("#anchor2", "click", function(e){ e.preventDefault(); });
+	var hash = window.location.hash;
+	jQuery("#anchor2").trigger("click");
+	equals( window.location.hash, hash, "e.preventDefault() worked" );
+	jQuery("#body").undelegate("#anchor2", "click");
+
+	// Test binding the same handler to multiple points
+	var called = 0;
+	function callback(){ called++; return false; }
+
+	jQuery("#body").delegate("#nothiddendiv", "click", callback);
+	jQuery("#body").delegate("#anchor2", "click", callback);
+
+	jQuery("#nothiddendiv").trigger("click");
+	equals( called, 1, "Verify that only one click occurred." );
+
+	jQuery("#anchor2").trigger("click");
+	equals( called, 2, "Verify that only one click occurred." );
+
+	// Make sure that only one callback is removed
+	jQuery("#body").undelegate("#anchor2", "click", callback);
+
+	jQuery("#nothiddendiv").trigger("click");
+	equals( called, 3, "Verify that only one click occurred." );
+
+	jQuery("#anchor2").trigger("click");
+	equals( called, 3, "Verify that no click occurred." );
+
+	// Make sure that it still works if the selector is the same,
+	// but the event type is different
+	jQuery("#body").delegate("#nothiddendiv", "foo", callback);
+
+	// Cleanup
+	jQuery("#body").undelegate("#nothiddendiv", "click", callback);
+
+	jQuery("#nothiddendiv").trigger("click");
+	equals( called, 3, "Verify that no click occurred." );
+
+	jQuery("#nothiddendiv").trigger("foo");
+	equals( called, 4, "Verify that one foo occurred." );
+
+	// Cleanup
+	jQuery("#body").undelegate("#nothiddendiv", "foo", callback);
+	
+	// Make sure we don't loose the target by DOM modifications
+	// after the bubble already reached the liveHandler
+	var livec = 0, elemDiv = jQuery("#nothiddendivchild").html('<span></span>').get(0);
+	
+	jQuery("#body").delegate("#nothiddendivchild", "click", function(e){ jQuery("#nothiddendivchild").html(''); });
+	jQuery("#body").delegate("#nothiddendivchild", "click", function(e){ if(e.target) {livec++;} });
+	
+	jQuery("#nothiddendiv span").click();
+	equals( jQuery("#nothiddendiv span").length, 0, "Verify that first handler occurred and modified the DOM." );
+	equals( livec, 1, "Verify that second handler occurred even with nuked target." );
+	
+	// Cleanup
+	jQuery("#body").undelegate("#nothiddendivchild", "click");
+
+	// Verify that .live() ocurs and cancel buble in the same order as
+	// we would expect .bind() and .click() without delegation
+	var lived = 0, livee = 0;
+	
+	// bind one pair in one order
+	jQuery("#body").delegate('span#liveSpan1 a', 'click', function(){ lived++; return false; });
+	jQuery("#body").delegate('span#liveSpan1', 'click', function(){ livee++; });
+
+	jQuery('span#liveSpan1 a').click();
+	equals( lived, 1, "Verify that only one first handler occurred." );
+	equals( livee, 0, "Verify that second handler doesn't." );
+
+	// and one pair in inverse
+	jQuery("#body").delegate('span#liveSpan2', 'click', function(){ livee++; });
+	jQuery("#body").delegate('span#liveSpan2 a', 'click', function(){ lived++; return false; });
+
+	lived = 0;
+	livee = 0;
+	jQuery('span#liveSpan2 a').click();
+	equals( lived, 1, "Verify that only one first handler occurred." );
+	equals( livee, 0, "Verify that second handler doesn't." );
+	
+	// Cleanup
+	jQuery("#body").undelegate("click");
+	
+	// Test this, target and currentTarget are correct
+	jQuery("#body").delegate('span#liveSpan1', 'click', function(e){ 
+		equals( this.id, 'liveSpan1', 'Check the this within a delegate handler' );
+		equals( e.currentTarget.id, 'liveSpan1', 'Check the event.currentTarget within a delegate handler' );
+		equals( e.target.nodeName.toUpperCase(), 'A', 'Check the event.target within a delegate handler' );
+	});
+	
+	jQuery('span#liveSpan1 a').click();
+	
+	jQuery("#body").undelegate('span#liveSpan1', 'click');
+
+	// Work with deep selectors
+	livee = 0;
+
+	function clickB(){ livee++; }
+
+	jQuery("#body").delegate("#nothiddendiv div", "click", function(){ livee++; });
+	jQuery("#body").delegate("#nothiddendiv div", "click", clickB);
+	jQuery("#body").delegate("#nothiddendiv div", "mouseover", function(){ livee++; });
+
+	equals( livee, 0, "No clicks, deep selector." );
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("click");
+	equals( livee, 2, "Click, deep selector." );
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("mouseover");
+	equals( livee, 1, "Mouseover, deep selector." );
+
+	jQuery("#body").undelegate("#nothiddendiv div", "mouseover");
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("click");
+	equals( livee, 2, "Click, deep selector." );
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("mouseover");
+	equals( livee, 0, "Mouseover, deep selector." );
+
+	jQuery("#body").undelegate("#nothiddendiv div", "click", clickB);
+
+	livee = 0;
+	jQuery("#nothiddendivchild").trigger("click");
+	equals( livee, 1, "Click, deep selector." );
+
+	jQuery("#body").undelegate("#nothiddendiv div", "click");
+});
+
+test("undelegate all bound events", function(){
+	expect(1);
+
+	var count = 0;
+	var div = jQuery("#body");
+
+	div.delegate("div#nothiddendivchild", "click submit", function(){ count++; });
+	div.undelegate();
+
+	jQuery("div#nothiddendivchild").trigger("click");
+	jQuery("div#nothiddendivchild").trigger("submit");
+
+	equals( count, 0, "Make sure no events were triggered." );
+});
+
+test("delegate with multiple events", function(){
+	expect(1);
+
+	var count = 0;
+	var div = jQuery("#body");
+
+	div.delegate("div#nothiddendivchild", "click submit", function(){ count++; });
+
+	jQuery("div#nothiddendivchild").trigger("click");
+	jQuery("div#nothiddendivchild").trigger("submit");
+
+	equals( count, 2, "Make sure both the click and submit were triggered." );
+
+	jQuery("#body").undelegate();
+});
+
+test("delegate with change", function(){
+	var selectChange = 0, checkboxChange = 0;
+	
+	var select = jQuery("select[name='S1']");
+	jQuery("#body").delegate("select[name='S1']", "change", function() {
+		selectChange++;
+	});
+	
+	var checkbox = jQuery("#check2"), 
+		checkboxFunction = function(){
+			checkboxChange++;
+		}
+	jQuery("#body").delegate("#check2", "change", checkboxFunction);
+	
+	// test click on select
+
+	// second click that changed it
+	selectChange = 0;
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 1, "Change on click." );
+	
+	// test keys on select
+	selectChange = 0;
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 1, "Change on keyup." );
+	
+	// test click on checkbox
+	checkbox.trigger("change");
+	equals( checkboxChange, 1, "Change on checkbox." );
+	
+	// test before activate on radio
+	
+	// test blur/focus on textarea
+	var textarea = jQuery("#area1"), textareaChange = 0, oldVal = textarea.val();
+	jQuery("#body").delegate("#area1", "change", function() {
+		textareaChange++;
+	});
+
+	textarea.val(oldVal + "foo");
+	textarea.trigger("change");
+	equals( textareaChange, 1, "Change on textarea." );
+
+	textarea.val(oldVal);
+	jQuery("#body").undelegate("#area1", "change");
+	
+	// test blur/focus on text
+	var text = jQuery("#name"), textChange = 0, oldTextVal = text.val();
+	jQuery("#body").delegate("#name", "change", function() {
+		textChange++;
+	});
+
+	text.val(oldVal+"foo");
+	text.trigger("change");
+	equals( textChange, 1, "Change on text input." );
+
+	text.val(oldTextVal);
+	jQuery("#body").die("change");
+	
+	// test blur/focus on password
+	var password = jQuery("#name"), passwordChange = 0, oldPasswordVal = password.val();
+	jQuery("#body").delegate("#name", "change", function() {
+		passwordChange++;
+	});
+
+	password.val(oldPasswordVal + "foo");
+	password.trigger("change");
+	equals( passwordChange, 1, "Change on password input." );
+
+	password.val(oldPasswordVal);
+	jQuery("#body").undelegate("#name", "change");
+	
+	// make sure die works
+	
+	// die all changes
+	selectChange = 0;
+	jQuery("#body").undelegate("select[name='S1']", "change");
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 0, "Die on click works." );
 
-	// Setup
-	jQuery("<input type='text' id='livefb' />").appendTo("body");
+	selectChange = 0;
+	select[0].selectedIndex = select[0].selectedIndex ? 0 : 1;
+	select.trigger("change");
+	equals( selectChange, 0, "Die on keyup works." );
 	
-	var $child =  jQuery("#livefb"),
-		child = $child[0],
-		pass = {};
+	// die specific checkbox
+	jQuery("#body").undelegate("#check2", "change", checkboxFunction);
+	checkbox.trigger("change");
+	equals( checkboxChange, 1, "Die on checkbox." );
+});
+
+test("delegate with submit", function() {
+	var count1 = 0, count2 = 0;
+	
+	jQuery("#body").delegate("#testForm", "submit", function(ev) {
+		count1++;
+		ev.preventDefault();
+	});
+
+	jQuery(document).delegate("body", "submit", function(ev) {
+		count2++;
+		ev.preventDefault();
+	});
 
-	function worked(e){
-		pass[e.type] = true;
+	if ( jQuery.support.submitBubbles ) {
+		jQuery("#testForm input[name=sub1]")[0].click();
+		equals(count1,1 );
+		equals(count2,1);
+	} else {
+		jQuery("#testForm input[name=sub1]")[0].click();
+		jQuery("#testForm input[name=T1]").trigger({type: "keypress", keyCode: 13});
+		equals(count1,2);
+		equals(count2,2);
 	}
 	
-	$child.live("focus", worked);
-	$child.live("blur", worked);
-	
-	// Test
-	child.focus();
-	if (pass.focus)
-		ok(true, "Test live() with focus event");
-	else
-		ok(true, "Cannot test focus because the window isn't focused");
-
-	child.blur();
-	if (pass.blur)
-		ok( true, "Test live() with blur event");
-	else
-		ok(true, "Cannot test blur because the window isn't focused");
-	
-	// Teardown
-	$child.die("focus", worked);
-	$child.die("blur", worked);
-	$child.remove();
-	window.scrollTo(0,0);
+	jQuery("#body").undelegate();
+	jQuery(document).undelegate();
 });
 
 test("Non DOM element events", function() {