X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=43a4542f0c427627bc88500cfadc32a8fbd22c5e;hb=9bcd2b370b4aa72cc60af85d0f8a0872d0d17a0a;hp=e27530e1f4b8b4983993d50baf0cdcc43e766507;hpb=ffbedf0262b3eea906f39c0115b818d7456a3994;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index e27530e..43a4542 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1,7 +1,7 @@
 module("event");
 
 test("bind()", function() {
-	expect(16);
+	expect(19);
 
 	var handler = function(event) {
 		ok( event.data, "bind() with data, check passed data exists" );
@@ -18,7 +18,20 @@ test("bind()", function() {
 		ok( data, "Check trigger data" );
 		ok( data.bar == "foo", "Check value of trigger data" );
 	};
-	$("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind(handler);
+	$("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind("click", handler);
+	
+	reset();
+	var clickCounter = mouseoverCounter = 0;
+	var handler = function(event) {
+		if (event.type == "click")
+			clickCounter += 1;
+		else if (event.type == "mouseover")
+			mouseoverCounter += 1;
+	};
+	$("#firstp").bind("click mouseover", handler).trigger("click").trigger("mouseover");
+	ok( clickCounter == 1, "bind() with multiple events at once" );
+	ok( mouseoverCounter == 1, "bind() with multiple events at once" );
+	
 	
 	reset();
 	var handler = function(event) {
@@ -72,6 +85,11 @@ test("bind()", function() {
 	$("#nonnodes").contents().bind("tester", function () {
 		equals(this.nodeType, 1, "Check node,textnode,comment bind just does real nodes" );
 	}).trigger("tester");
+
+	// Make sure events stick with appendTo'd elements (which are cloned) #2027
+	$("<a href='#fail' class='test'>test</a>").click(function(){ return false; }).appendTo("p");
+	ok( $("a.test:first").triggerHandler("click") === false, "Handler is bound to appendTo'd elements" );
+	reset();
 });
 
 test("click()", function() {
@@ -96,7 +114,7 @@ test("click()", function() {
 });
 
 test("unbind(event)", function() {
-	expect(6);
+	expect(8);
 	var el = $("#firstp");
 	el.click(function() {
 		ok( true, "Fake normal bind" );
@@ -118,10 +136,22 @@ test("unbind(event)", function() {
 
 	el.unbind('click');
 	ok( !jQuery.data(el[0], "events"), "Removed the events expando after all handlers are unbound." );
+	
+	reset();
+	var clickCounter = mouseoverCounter = 0;
+	var handler = function(event) {
+		if (event.type == "click")
+			clickCounter += 1;
+		else if (event.type == "mouseover")
+			mouseoverCounter += 1;
+	};
+	$("#firstp").bind("click mouseover", handler).unbind("click mouseover", handler).trigger("click").trigger("mouseover");
+	ok( clickCounter == 0, "unbind() with multiple events at once" );
+	ok( mouseoverCounter == 0, "unbind() with multiple events at once" );
 });
 
 test("trigger(event, [data], [fn])", function() {
-	expect(66);
+	expect(67);
 
 	var handler = function(event, a, b, c) {
 		equals( event.type, "click", "check passed data" );
@@ -192,7 +222,18 @@ test("trigger(event, [data], [fn])", function() {
 
 	// Trigger only the handlers (no native) and extra fn, with external event obj
 	// Triggers 9
+	eventObj = jQuery.event.fix({ type: "foo", target: document.body });
 	equals( $("#firstp").triggerHandler("click", [eventObj, 1, "2", "abc"], handler), "test", "Verify handler response" );
+	
+	var pass = true;
+	try {
+		$('input:first')
+			.hide()
+			.trigger('focus');
+	} catch(e) {
+		pass = false;
+	}
+	ok( pass, "Trigger focus on hidden element" );
 
 	// have the extra handler override the return
 	// Triggers 9
@@ -228,3 +269,11 @@ test("toggle(Function, Function)", function() {
 		return false;
 	}).click().click().click();
 });
+
+test("jQuery(function($) {})", function() {
+	stop();
+	jQuery(function($) {
+		equals(jQuery, $, "ready doesn't provide an event object, instead it provides a reference to the jQuery function, see http://docs.jquery.com/Events/ready#fn");
+		start();
+	});
+});