X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=ba29ab7ecccd228da2cda7b8e365d6df6ffeb733;hb=703e89ba302e86bba1f4777ce1a6aee6f38b7b87;hp=e1a95497d3010f206748a73fa653d42aca1bc5e0;hpb=66fbbec3bb2d0555da55eea4abae0081484d37b4;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index e1a9549..ba29ab7 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1,8 +1,7 @@
 module("event");
 
-test("bind()", function() {
-	expect(15);
-
+test("bind(), with data", function() {
+	expect(3);
 	var handler = function(event) {
 		ok( event.data, "bind() with data, check passed data exists" );
 		ok( event.data.foo == "bar", "bind() with data, Check value of passed data" );
@@ -10,23 +9,43 @@ test("bind()", function() {
 	$("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
 
 	ok( !jQuery.data($("#firstp")[0], "events"), "Event handler unbound when using data." );
-	
-	reset();
+});
+
+test("bind(), with data, trigger with data", function() {
+	expect(4);
 	var handler = function(event, data) {
 		ok( event.data, "check passed data exists" );
 		ok( event.data.foo == "bar", "Check value of passed data" );
 		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);
-	
-	reset();
+	$("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind("click", handler);
+});
+
+test("bind(), multiple events at once", function() {
+	expect(2);
+	var clickCounter = 0,
+		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" );
+});
+
+test("bind(), no data", function() {
+	expect(1);
 	var handler = function(event) {
 		ok ( !event.data, "Check that no data is added to the event object" );
 	};
 	$("#firstp").bind("click", handler).trigger("click");
-	
-	
+});
+
+test("bind(), iframes", function() {
 	// events don't work with iframes, see #939 - this test fails in IE because of contentDocument
 	// var doc = document.getElementById("iframe").contentDocument;
 	// 
@@ -37,7 +56,10 @@ test("bind()", function() {
 	// $(input).bind("click",function() {
 	// 	ok( true, "Binding to element inside iframe" );
 	// }).click();
-	
+});
+
+test("bind(), trigger change on select", function() {
+	expect(3);
 	var counter = 0;
 	function selectOnChange(event) {
 		equals( event.data, counter++, "Event.data is not a global event object" );
@@ -45,8 +67,14 @@ test("bind()", function() {
 	$("#form select").each(function(i){
 		$(this).bind('change', i, selectOnChange);
 	}).trigger('change');
+});
 
-	reset();
+test("bind(), namespaced events, cloned events", function() {
+	expect(6);
+
+	$("#firstp").bind("custom.test",function(e){
+		ok(true, "Custom event triggered");
+	});
 
 	$("#firstp").bind("click",function(e){
 		ok(true, "Normal click triggered");
@@ -67,6 +95,21 @@ test("bind()", function() {
 
 	// Trigger the remaining fn (1)
 	$("#firstp").trigger("click");
+
+	// Remove the remaining fn
+	$("#firstp").unbind(".test");
+
+	// Trigger the remaining fn (0)
+	$("#firstp").trigger("custom");
+
+	// using contents will get comments regular, text, and comment nodes
+	$("#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" );
 });
 
 test("click()", function() {
@@ -91,7 +134,7 @@ test("click()", function() {
 });
 
 test("unbind(event)", function() {
-	expect(6);
+	expect(8);
 	var el = $("#firstp");
 	el.click(function() {
 		ok( true, "Fake normal bind" );
@@ -113,10 +156,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" );
@@ -187,7 +242,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
@@ -223,3 +289,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();
+	});
+});