X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=786a46ef1a1d31cc973c76227158ac4b1dcbcb99;hb=9584e908a2daa2a72bd738302dba7cfd0656dbdf;hp=ed9621317ad5965b8b8a7077da88f1f845d42a06;hpb=e7912805d6ee290071fb15fbca752e9f47fcd032;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index ed96213..786a46e 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -11,6 +11,17 @@ test("bind(), with data", function() {
 	ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data." );
 });
 
+test("click(), with data", function() {
+	expect(3);
+	var handler = function(event) {
+		ok( event.data, "bind() with data, check passed data exists" );
+		equals( event.data.foo, "bar", "bind() with data, Check value of passed data" );
+	};
+	jQuery("#firstp").click({foo: "bar"}, handler).click().unbind("click", handler);
+
+	ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data." );
+});
+
 test("bind(), with data, trigger with data", function() {
 	expect(4);
 	var handler = function(event, data) {
@@ -72,7 +83,7 @@ test("bind(), multiple events at once and namespaces", function() {
 });
 
 test("bind(), namespace with special add", function() {
-	expect(18);
+	expect(24);
 
 	var div = jQuery("<div/>").bind("test", function(e) {
 		ok( true, "Test event fired." );
@@ -87,7 +98,9 @@ test("bind(), namespace with special add", function() {
 			equals( e.target, div[0], "And that the target is correct." );
 		},
 		setup: function(){},
-		teardown: function(){},
+		teardown: function(){
+			ok(true, "Teardown called.");
+		},
 		add: function( handleObj ) {
 			var handler = handleObj.handler;
 			handleObj.handler = function(e) {
@@ -95,7 +108,9 @@ test("bind(), namespace with special add", function() {
 				handler.apply( this, arguments );
 			};
 		},
-		remove: function() {}
+		remove: function() {
+			ok(true, "Remove called.");
+		}
 	};
 
 	div.bind("test.a", {x: 1}, function(e) {
@@ -116,6 +131,18 @@ test("bind(), namespace with special add", function() {
 
 	// Should trigger 2
 	div.trigger("test.b");
+
+	// Should trigger 4
+	div.unbind("test");
+
+	div = jQuery("<div/>").bind("test", function(e) {
+		ok( true, "Test event fired." );
+	});
+
+	// Should trigger 2
+	div.appendTo("#main").remove();
+
+	delete jQuery.event.special.test;
 });
 
 test("bind(), no data", function() {
@@ -300,6 +327,44 @@ test("bind(), multi-namespaced events", function() {
 	jQuery("#firstp").trigger("custom");
 });
 
+test("bind(), with same function", function() {
+	expect(2)
+
+	var count = 0 ,  func = function(){
+		count++;
+	};
+
+	jQuery("#liveHandlerOrder").bind("foo.bar", func).bind("foo.zar", func);
+	jQuery("#liveHandlerOrder").trigger("foo.bar");
+
+	equals(count, 1, "Verify binding function with multiple namespaces." );
+
+	jQuery("#liveHandlerOrder").unbind("foo.bar", func).unbind("foo.zar", func);
+	jQuery("#liveHandlerOrder").trigger("foo.bar");
+
+	equals(count, 1, "Verify that removing events still work." );
+});
+
+test("bind(), make sure order is maintained", function() {
+	expect(1);
+
+	var elem = jQuery("#firstp"), log = [], check = [];
+
+	for ( var i = 0; i < 100; i++ ) (function(i){
+		elem.bind( "click", function(){
+			log.push( i );
+		});
+
+		check.push( i );
+	})(i);
+
+	elem.trigger("click");
+
+	equals( log.join(","), check.join(","), "Make sure order was maintained." );
+
+	elem.unbind("click");
+});
+ 
 test("bind(), with different this object", function() {
 	expect(4);
 	var thisObject = { myThis: true },
@@ -319,6 +384,54 @@ test("bind(), with different this object", function() {
 	ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data." );
 });
 
+test("bind(name, false), unbind(name, false)", function() {
+	expect(3);
+
+	var main = 0;
+	jQuery("#main").bind("click", function(e){ main++; });
+	jQuery("#ap").trigger("click");
+	equals( main, 1, "Verify that the trigger happened correctly." );
+
+	main = 0;
+	jQuery("#ap").bind("click", false);
+	jQuery("#ap").trigger("click");
+	equals( main, 0, "Verify that no bubble happened." );
+
+	main = 0;
+	jQuery("#ap").unbind("click", false);
+	jQuery("#ap").trigger("click");
+	equals( main, 1, "Verify that the trigger happened correctly." );
+});
+
+test("bind()/trigger()/unbind() on plain object", function() {
+	expect( 2 );
+
+	var obj = {};
+
+	// Make sure it doesn't complain when no events are found
+	jQuery(obj).trigger("test");
+
+	// Make sure it doesn't complain when no events are found
+	jQuery(obj).unbind("test");
+
+	jQuery(obj).bind("test", function(){
+		ok( true, "Custom event run." );
+	});
+
+	ok( jQuery(obj).data("events"), "Object has events bound." );
+
+	// Should trigger 1
+	jQuery(obj).trigger("test");
+
+	jQuery(obj).unbind("test");
+
+	// Should trigger 0
+	jQuery(obj).trigger("test");
+
+	// Make sure it doesn't complain when no events are found
+	jQuery(obj).unbind("test");
+});
+
 test("unbind(type)", function() {
 	expect( 0 );
 	
@@ -717,7 +830,7 @@ test("toggle(Function, Function, ...)", function() {
 });
 
 test(".live()/.die()", function() {
-	expect(65);
+	expect(66);
 
 	var submit = 0, div = 0, livea = 0, liveb = 0;
 
@@ -734,6 +847,7 @@ test(".live()/.die()", function() {
 	equals( liveb, 0, "Click on body" );
 
 	// This should trigger two events
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendiv").trigger("click");
 	equals( submit, 0, "Click on div" );
 	equals( div, 1, "Click on div" );
@@ -741,55 +855,62 @@ test(".live()/.die()", function() {
 	equals( liveb, 0, "Click on div" );
 
 	// This should trigger three events (w/ bubbling)
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").trigger("click");
 	equals( submit, 0, "Click on inner div" );
 	equals( div, 2, "Click on inner div" );
-	equals( livea, 2, "Click on inner div" );
+	equals( livea, 1, "Click on inner div" );
 	equals( liveb, 1, "Click on inner div" );
 
 	// This should trigger one submit
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").trigger("submit");
 	equals( submit, 1, "Submit on div" );
-	equals( div, 2, "Submit on div" );
-	equals( livea, 2, "Submit on div" );
-	equals( liveb, 1, "Submit on div" );
+	equals( div, 0, "Submit on div" );
+	equals( livea, 0, "Submit on div" );
+	equals( liveb, 0, "Submit on div" );
 
 	// Make sure no other events were removed in the process
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").trigger("click");
-	equals( submit, 1, "die Click on inner div" );
-	equals( div, 3, "die Click on inner div" );
-	equals( livea, 3, "die Click on inner div" );
-	equals( liveb, 2, "die Click on inner div" );
+	equals( submit, 0, "die Click on inner div" );
+	equals( div, 2, "die Click on inner div" );
+	equals( livea, 1, "die Click on inner div" );
+	equals( liveb, 1, "die Click on inner div" );
 
 	// Now make sure that the removal works
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").die("click");
 	jQuery("div#nothiddendivchild").trigger("click");
-	equals( submit, 1, "die Click on inner div" );
-	equals( div, 4, "die Click on inner div" );
-	equals( livea, 4, "die Click on inner div" );
-	equals( liveb, 2, "die Click on inner div" );
+	equals( submit, 0, "die Click on inner div" );
+	equals( div, 2, "die Click on inner div" );
+	equals( livea, 1, "die Click on inner div" );
+	equals( liveb, 0, "die Click on inner div" );
 
 	// Make sure that the click wasn't removed too early
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendiv").trigger("click");
-	equals( submit, 1, "die Click on inner div" );
-	equals( div, 5, "die Click on inner div" );
-	equals( livea, 5, "die Click on inner div" );
-	equals( liveb, 2, "die Click on inner div" );
+	equals( submit, 0, "die Click on inner div" );
+	equals( div, 1, "die Click on inner div" );
+	equals( livea, 1, "die Click on inner div" );
+	equals( liveb, 0, "die Click on inner div" );
 
 	// Make sure that stopPropgation doesn't stop live events
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").live("click", function(e){ liveb++; e.stopPropagation(); });
 	jQuery("div#nothiddendivchild").trigger("click");
-	equals( submit, 1, "stopPropagation Click on inner div" );
-	equals( div, 6, "stopPropagation Click on inner div" );
-	equals( livea, 6, "stopPropagation Click on inner div" );
-	equals( liveb, 3, "stopPropagation Click on inner div" );
+	equals( submit, 0, "stopPropagation Click on inner div" );
+	equals( div, 1, "stopPropagation Click on inner div" );
+	equals( livea, 0, "stopPropagation Click on inner div" );
+	equals( liveb, 1, "stopPropagation Click on inner div" );
 
 	// Make sure click events only fire with primary click
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	var event = jQuery.Event("click");
 	event.button = 1;
 	jQuery("div#nothiddendiv").trigger(event);
 
-	equals( livea, 6, "live secondary click" );
+	equals( livea, 0, "live secondary click" );
 
 	jQuery("div#nothiddendivchild").die("click");
 	jQuery("div#nothiddendiv").die("click");
@@ -974,6 +1095,14 @@ test(".live()/.die()", function() {
 	equals( livee, 1, "Click, deep selector." );
 
 	jQuery("#nothiddendiv div").die("click");
+
+	jQuery("#nothiddendiv div").live("blur", function(){
+		ok( true, "Live div trigger blur." );
+	});
+
+	jQuery("#nothiddendiv div").trigger("blur");
+
+	jQuery("#nothiddendiv div").die("blur");
 });
 
 test("die all bound events", function(){
@@ -1005,6 +1134,58 @@ test("live with multiple events", function(){
 	equals( count, 2, "Make sure both the click and submit were triggered." );
 });
 
+test("live with namespaces", function(){
+	expect(12);
+
+	var count1 = 0, count2 = 0;
+
+	jQuery("#liveSpan1").live("foo.bar", function(e){
+		count1++;
+	});
+
+	jQuery("#liveSpan1").live("foo.zed", function(e){
+		count2++;
+	});
+
+	jQuery("#liveSpan1").trigger("foo.bar");
+	equals( count1, 1, "Got live foo.bar" );
+	equals( count2, 0, "Got live foo.bar" );
+
+	count1 = 0, count2 = 0;
+
+	jQuery("#liveSpan1").trigger("foo.zed");
+	equals( count1, 0, "Got live foo.zed" );
+	equals( count2, 1, "Got live foo.zed" );
+
+	//remove one
+	count1 = 0, count2 = 0;
+
+	jQuery("#liveSpan1").die("foo.zed");
+	jQuery("#liveSpan1").trigger("foo.bar");
+
+	equals( count1, 1, "Got live foo.bar after dieing foo.zed" );
+	equals( count2, 0, "Got live foo.bar after dieing foo.zed" );
+
+	count1 = 0, count2 = 0;
+
+	jQuery("#liveSpan1").trigger("foo.zed");
+	equals( count1, 0, "Got live foo.zed" );
+	equals( count2, 0, "Got live foo.zed" );
+
+	//remove the other
+	jQuery("#liveSpan1").die("foo.bar");
+
+	count1 = 0, count2 = 0;
+
+	jQuery("#liveSpan1").trigger("foo.bar");
+	equals( count1, 0, "Did not respond to foo.bar after dieing it" );
+	equals( count2, 0, "Did not respond to foo.bar after dieing it" );
+
+	jQuery("#liveSpan1").trigger("foo.zed");
+	equals( count1, 0, "Did not trigger foo.zed again" );
+	equals( count2, 0, "Did not trigger foo.zed again" );
+});
+
 test("live with change", function(){
 	var selectChange = 0, checkboxChange = 0;
 	
@@ -1144,6 +1325,7 @@ test(".delegate()/.undelegate()", function() {
 	equals( liveb, 0, "Click on body" );
 
 	// This should trigger two events
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendiv").trigger("click");
 	equals( submit, 0, "Click on div" );
 	equals( div, 1, "Click on div" );
@@ -1151,55 +1333,62 @@ test(".delegate()/.undelegate()", function() {
 	equals( liveb, 0, "Click on div" );
 
 	// This should trigger three events (w/ bubbling)
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").trigger("click");
 	equals( submit, 0, "Click on inner div" );
 	equals( div, 2, "Click on inner div" );
-	equals( livea, 2, "Click on inner div" );
+	equals( livea, 1, "Click on inner div" );
 	equals( liveb, 1, "Click on inner div" );
 
 	// This should trigger one submit
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").trigger("submit");
 	equals( submit, 1, "Submit on div" );
-	equals( div, 2, "Submit on div" );
-	equals( livea, 2, "Submit on div" );
-	equals( liveb, 1, "Submit on div" );
+	equals( div, 0, "Submit on div" );
+	equals( livea, 0, "Submit on div" );
+	equals( liveb, 0, "Submit on div" );
 
 	// Make sure no other events were removed in the process
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendivchild").trigger("click");
-	equals( submit, 1, "undelegate Click on inner div" );
-	equals( div, 3, "undelegate Click on inner div" );
-	equals( livea, 3, "undelegate Click on inner div" );
-	equals( liveb, 2, "undelegate Click on inner div" );
+	equals( submit, 0, "undelegate Click on inner div" );
+	equals( div, 2, "undelegate Click on inner div" );
+	equals( livea, 1, "undelegate Click on inner div" );
+	equals( liveb, 1, "undelegate Click on inner div" );
 
 	// Now make sure that the removal works
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("#body").undelegate("div#nothiddendivchild", "click");
 	jQuery("div#nothiddendivchild").trigger("click");
-	equals( submit, 1, "undelegate Click on inner div" );
-	equals( div, 4, "undelegate Click on inner div" );
-	equals( livea, 4, "undelegate Click on inner div" );
-	equals( liveb, 2, "undelegate Click on inner div" );
+	equals( submit, 0, "undelegate Click on inner div" );
+	equals( div, 2, "undelegate Click on inner div" );
+	equals( livea, 1, "undelegate Click on inner div" );
+	equals( liveb, 0, "undelegate Click on inner div" );
 
 	// Make sure that the click wasn't removed too early
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("div#nothiddendiv").trigger("click");
-	equals( submit, 1, "undelegate Click on inner div" );
-	equals( div, 5, "undelegate Click on inner div" );
-	equals( livea, 5, "undelegate Click on inner div" );
-	equals( liveb, 2, "undelegate Click on inner div" );
+	equals( submit, 0, "undelegate Click on inner div" );
+	equals( div, 1, "undelegate Click on inner div" );
+	equals( livea, 1, "undelegate Click on inner div" );
+	equals( liveb, 0, "undelegate Click on inner div" );
 
 	// Make sure that stopPropgation doesn't stop live events
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	jQuery("#body").delegate("div#nothiddendivchild", "click", function(e){ liveb++; e.stopPropagation(); });
 	jQuery("div#nothiddendivchild").trigger("click");
-	equals( submit, 1, "stopPropagation Click on inner div" );
-	equals( div, 6, "stopPropagation Click on inner div" );
-	equals( livea, 6, "stopPropagation Click on inner div" );
-	equals( liveb, 3, "stopPropagation Click on inner div" );
+	equals( submit, 0, "stopPropagation Click on inner div" );
+	equals( div, 1, "stopPropagation Click on inner div" );
+	equals( livea, 0, "stopPropagation Click on inner div" );
+	equals( liveb, 1, "stopPropagation Click on inner div" );
 
 	// Make sure click events only fire with primary click
+	submit = 0, div = 0, livea = 0, liveb = 0;
 	var event = jQuery.Event("click");
 	event.button = 1;
 	jQuery("div#nothiddendiv").trigger(event);
 
-	equals( livea, 6, "delegate secondary click" );
+	equals( livea, 0, "delegate secondary click" );
 
 	jQuery("#body").undelegate("div#nothiddendivchild", "click");
 	jQuery("#body").undelegate("div#nothiddendiv", "click");
@@ -1540,24 +1729,15 @@ test("delegate with submit", function() {
 });
 
 test("Non DOM element events", function() {
-	expect(3);
-
-	jQuery({})
-		.bind('nonelementglobal', function(e) {
-			ok( true, "Global event on non-DOM annonymos object triggered" );
-		});
+	expect(1);
 
 	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).bind('nonelementobj', function(e) {
+		ok( true, "Event on non-DOM object triggered" );
+	});
 
 	jQuery(o).trigger('nonelementobj');
-	jQuery.event.trigger('nonelementglobal');
 });
 
 /*