X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=c64148720d2ed133d856da968d70f15b9e6eb6d3;hb=5e0da8c0365b729f63fbd6d27223776551cb8f46;hp=89067288386cea43ab822950a2cf8b27cd32407e;hpb=45b8d2531ef6a7c775ca3bac06bcad6ffc5419e3;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index 8906728..c641487 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -162,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 );
 	
@@ -233,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() {
@@ -300,7 +337,7 @@ test("trigger() bubbling", function() {
 });
 
 test("trigger(type, [data], [fn])", function() {
-	expect(11);
+	expect(12);
 
 	var handler = function(event, a, b, c) {
 		equals( event.type, "click", "check passed data" );
@@ -337,6 +374,14 @@ test("trigger(type, [data], [fn])", function() {
 		pass = false;
 	}
 	ok( pass, "Trigger focus on hidden element" );
+	
+	pass = true;
+	try {
+		jQuery('table:first').bind('test:test', function(){}).trigger('test:test');
+	} catch (e) {
+		pass = false;
+	}
+	ok( pass, "Trigger on a table with a colon in the even type, see #3533" );
 });
 
 test("trigger(eventObject, [data], [fn])", function() {
@@ -490,7 +535,7 @@ test("toggle(Function, Function, ...)", function() {
 });
 
 test(".live()/.die()", function() {
-	expect(52);
+	expect(58);
 
 	var submit = 0, div = 0, livea = 0, liveb = 0;
 
@@ -579,6 +624,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; });
@@ -681,6 +745,58 @@ test(".live()/.die()", function() {
 	jQuery('span#liveSpan1').die('click');
 });
 
+test("live with focus/blur", function(){
+	expect(2);
+
+	// Setup
+	jQuery("<input type='text' id='livefb' />").appendTo("body");
+	
+	var $child =  jQuery("#livefb"),
+		child = $child[0],
+		counter = 0;
+
+	function count(){
+		counter++;
+	}
+	
+	// Test
+	$child.live("focus", count);
+	$child.live("blur", count);
+
+	child.focus();
+	equals(counter, 1, "Test live() with focus event");
+	window.scrollTo(0,0);
+
+	child.blur();
+	equals(counter, 2, "Test live() with blur event");
+	
+	// Teardown
+	$child.die("focus", count);
+	$child.die("blur", count);
+	$child.remove();
+});
+
+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();