X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent%2FeventTest.js;h=334f286c78d37d78d64214780d934dae2bb780b7;hb=f96bf1041553775a94c1034c97e253e350217173;hp=6335925277a5c04e7df98122a6118ab49d2a6a57;hpb=2ad223aedd1f93c783d98d60adc9fda3bdfbb4b6;p=jquery.git

diff --git a/src/event/eventTest.js b/src/event/eventTest.js
index 6335925..334f286 100644
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -1,13 +1,15 @@
 module("event");
 
 test("bind()", function() {
-	expect(9);
+	expect(15);
 
 	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" );
-	}
-	$("#firstp").bind("click", {foo: "bar"}, handler).click();
+	};
+	$("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
+	
+	ok( !$("#firstp").get(0).$events, "Event handler unbound when using data." );
 	
 	reset();
 	var handler = function(event, data) {
@@ -15,20 +17,60 @@ test("bind()", function() {
 		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"}]);
-
+	};
+	$("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind(handler);
+	
+	reset();
+	var handler = function(event) {
+		ok ( !event.data, "Check that no data is added to the event object" );
+	};
+	$("#firstp").bind("click", handler).trigger("click");
+	
+	
+	// events don't work with iframes, see #939 - this test fails in IE because of contentDocument
+	// var doc = document.getElementById("iframe").contentDocument;
+	// 
+	// doc.body.innerHTML = "<input type='text'/>";
+	//  
+	// var input = doc.getElementsByTagName("input")[0];
+	//  
+	// $(input).bind("click",function() {
+	// 	ok( true, "Binding to element inside iframe" );
+	// }).click();
+	
 	var counter = 0;
 	function selectOnChange(event) {
 		equals( event.data, counter++, "Event.data is not a global event object" );
-	}
-	$("select").each(function(i){
+	};
+	$("#form select").each(function(i){
 		$(this).bind('change', i, selectOnChange);
 	}).trigger('change');
+
+	reset();
+
+        $("#firstp").bind("click",function(e){
+		ok(true, "Normal click triggered");
+        });
+
+        $("#firstp").bind("click.test",function(e){
+		ok(true, "Namespaced click triggered");
+        });
+
+	// Trigger both bound fn (2)
+        $("#firstp").trigger("click");
+
+	// Trigger one bound fn (1)
+        $("#firstp").trigger("click.test");
+
+	// Remove only the one fn
+        $("#firstp").unbind("click.test");
+
+	// Trigger the remaining fn (1)
+        $("#firstp").trigger("click");
 });
 
 test("click()", function() {
-	expect(3);
+	expect(4);
 	$('<li><a href="#">Change location</a></li>').prependTo('#firstUL').find('a').bind('click', function() {
 	    var close = $('spanx', this); // same with $(this).find('span');
 	    ok( close.length == 0, "Context element does not exist, length must be zero" );
@@ -39,6 +81,13 @@ test("click()", function() {
 	$("#check1").click(function() {
 		ok( true, "click event handler for checkbox gets fired twice, see #815" );
 	}).click();
+	
+	var counter = 0;
+	$('#firstp')[0].onclick = function(event) {
+		counter++;
+	};
+	$('#firstp').click();
+	ok( counter == 1, "Check that click, triggers onclick event handler also" );
 });
 
 test("unbind(event)", function() {
@@ -66,14 +115,60 @@ test("unbind(event)", function() {
 	ok( !el[0].$events, "Removed the events expando after all handlers are unbound." );
 });
 
-test("trigger(event, [data]", function() {
-	expect(3);
+test("trigger(event, [data], [fn])", function() {
+	expect(40);
+
 	var handler = function(event, a, b, c) {
-		ok( a == 1, "check passed data" );
-		ok( b == "2", "check passed data" );
-		ok( c == "abc", "check passed data" );
-	}
+		equals( event.type, "click", "check passed data" );
+		equals( a, 1, "check passed data" );
+		equals( b, "2", "check passed data" );
+		equals( c, "abc", "check passed data" );
+		return "test";
+	};
+
+	var handler2 = function(a, b, c) {
+		equals( a, 1, "check passed data" );
+		equals( b, "2", "check passed data" );
+		equals( c, "abc", "check passed data" );
+		return "test2";
+	};
+
+	// Simulate a "native" click
+	$("#firstp")[0].click = function(){
+		ok( true, "Native call was triggered" );
+	};
+
+	// Triggers handlrs and native
+	// Trigger 5
 	$("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
+
+	// Triggers handlers, native, and extra fn
+	// Triggers 8
+	$("#firstp").trigger("click", [1, "2", "abc"], handler2);
+
+	// Simulate a "native" click
+	$("#firstp")[0].click = function(){
+		ok( false, "Native call was triggered" );
+	};
+
+	// Trigger only the handlers (no native)
+	// Triggers 5
+	equals( $("#firstp").triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
+
+	// Trigger only the handlers (no native) and extra fn
+	// Triggers 8
+	equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler2), "test", "Verify handler response" );
+
+	// Build fake click event to pass in
+	var eventObj = jQuery.event.fix({ type: "click", target: document.body });
+
+	// Trigger only the handlers (no native), with external event obj
+	// Triggers 5
+	equals( $("#firstp").triggerHandler("foo", [eventObj, 1, "2", "abc"]), "test", "Verify handler response" );
+
+	// Trigger only the handlers (no native) and extra fn, with external event obj
+	// Triggers 9
+	equals( $("#firstp").triggerHandler("foo", [eventObj, 1, "2", "abc"], handler), "test", "Verify handler response" );
 });
 
 test("toggle(Function, Function)", function() {
@@ -96,4 +191,4 @@ test("toggle(Function, Function)", function() {
 		});
 		return false;
 	}).click().click().click();
-});
\ No newline at end of file
+});