X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=d324432767ea0dba58bddccb5676f6efdfab53aa;hb=811891785f5bfa3f42ec9cb18e68fc3a114935e9;hp=4120af14ef080f78e31e1fbb6afe28f9d902da05;hpb=851846aabea72fe784b8a13cfb04cffecdb771b6;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index 4120af1..d324432 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -47,15 +47,11 @@ test("bind(), no data", function() {
 
 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;
-	// 
-	// doc.body.innerHTML = "<input type='text'/>";
-	//
-	// var input = doc.getElementsByTagName("input")[0];
-	//
-	// jQuery(input).bind("click",function() {
-	// 	ok( true, "Binding to element inside iframe" );
-	// }).click();
+	var doc = jQuery("#loadediframe").contents();
+	
+	jQuery("div", doc).bind("click", function() {
+		ok( true, "Binding to element inside iframe" );
+	}).click().unbind('click');
 });
 
 test("bind(), trigger change on select", function() {
@@ -166,6 +162,25 @@ test("bind(), multi-namespaced events", function() {
 	jQuery("#firstp").trigger("custom");
 });
 
+test("bind(), with different this object", function() {
+	expect(4);
+	var thisObject = { myThis: true },
+		data = { myData: true },
+		handler1 = function( event ) {
+			equals( this, thisObject, "bind() with different this object" );
+		},
+		handler2 = function( event ) {
+			equals( this, thisObject, "bind() with different this object and data" );
+			equals( event.data, data, "bind() with different this object and data" );
+		};
+	
+	jQuery("#firstp")
+		.bind("click", handler1, thisObject).click().unbind("click", handler1)
+		.bind("click", data, handler2, thisObject).click().unbind("click", handler2);
+
+	ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data." );
+});
+
 test("unbind(type)", function() {
 	expect( 0 );
 	
@@ -237,6 +252,24 @@ test("unbind(eventObject)", function() {
 	assert( 0 );
 });
 
+test("hover()", function() {
+	var times = 0,
+		handler1 = function( event ) { ++times; },
+		handler2 = function( event ) { ++times; };
+
+	jQuery("#firstp")
+		.hover(handler1, handler2)
+		.mouseenter().mouseleave()
+		.unbind("mouseenter", handler1)
+		.unbind("mouseleave", handler2)
+		.hover(handler1)
+		.mouseenter().mouseleave()
+		.unbind("mouseenter mouseleave", handler1)
+		.mouseenter().mouseleave();
+
+	equals( times, 4, "hover handlers fired" );
+});
+
 test("trigger() shortcuts", function() {
 	expect(6);
 	jQuery('<li><a href="#">Change location</a></li>').prependTo('#firstUL').find('a').bind('click', function() {
@@ -494,7 +527,7 @@ test("toggle(Function, Function, ...)", function() {
 });
 
 test(".live()/.die()", function() {
-	expect(52);
+	expect(58);
 
 	var submit = 0, div = 0, livea = 0, liveb = 0;
 
@@ -583,6 +616,25 @@ test(".live()/.die()", function() {
 	jQuery("#foo").trigger('click');
 	equals( clicked, 2, "die with a context");
 
+	// Test binding with event data
+	jQuery("#foo").live("click", true, function(e){ equals( e.data, true, "live with event data" ); });
+	jQuery("#foo").trigger("click").die("click");
+
+	// Test binding with trigger data
+	jQuery("#foo").live("click", function(e, data){ equals( data, true, "live with trigger data" ); });
+	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").trigger("click").die("click");
+
+	// Test binding with different this object, event data, and trigger data
+	jQuery("#foo").live("click", true, 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" });
+	jQuery("#foo").trigger("click", true).die("click");
 
 	// Verify that return false prevents default action
 	jQuery("#anchor2").live("click", function(){ return false; });
@@ -685,6 +737,27 @@ test(".live()/.die()", function() {
 	jQuery('span#liveSpan1').die('click');
 });
 
+test("Non DOM element events", function() {
+	expect(3);
+
+	jQuery({})
+		.bind('nonelementglobal', function(e) {
+			ok( true, "Global event on non-DOM annonymos object triggered" );
+		});
+
+	var o = {};
+
+	jQuery(o)
+		.bind('nonelementobj', function(e) {
+			ok( true, "Event on non-DOM object triggered" );
+		}).bind('nonelementglobal', function() {
+			ok( true, "Global event on non-DOM object triggered" );
+		});
+
+	jQuery(o).trigger('nonelementobj');
+	jQuery.event.trigger('nonelementglobal');
+});
+
 /*
 test("jQuery(function($) {})", function() {
 	stop();