X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2FeventTest.js;h=b9daca6f7bb5bace7a883b435434502875085193;hb=06b89271c1c23e48f627d25b3df05ceef5c8fbc8;hp=d62173549635fa3c2e7d89f49644c19c9143d078;hpb=926e80b90226d176710e092bbfdcfd7b9f06389b;p=jquery.git

diff --git a/src/event/eventTest.js b/src/event/eventTest.js
index d621735..b9daca6 100644
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -4,18 +4,18 @@ test("toggle(Function, Function) - add toggle event and fake a few clicks", func
 	expect(1);
 	var count = 0,
 		fn1 = function(e) { count++; },
-		fn2 = function(e) { count--; console.debug("fn"); },
+		fn2 = function(e) { count--; },
 		preventDefault = function(e) { e.preventDefault() },
 		link = $('#mark');
-	if($.browser.msie)
-		ok( false, "click() on link gets executed in IE, not intended behaviour!" );
+	if ( $.browser.msie || $.browser.opera || /konquerer/i.test(navigator.userAgent) )
+		ok( false, "click() on link gets executed in IE/Opera/Konquerer, not intended behaviour!" );
 	else
 		link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click();
 	ok( count == 1, "Check for toggle(fn, fn)" );
 });
 
 test("unbind(event)", function() {
-	expect(3);
+	expect(6);
 	var el = $("#firstp");
 	el.click(function() {
 		ok( true, "Fake normal bind" );
@@ -25,6 +25,17 @@ test("unbind(event)", function() {
 		ok( true, "Fake onebind" );
 	});
 	el.click().click();
+	
+	el.click(function() { return; });
+	el.unbind('click');
+	ok( !el[0].onclick, "Handler is removed" ); // Bug #964
+
+	el.click(function() { return; });
+	el.unbind('change',function(){ return; });
+	ok( el[0].onclick, "Extra handlers weren't accidentally removed." );
+
+	el.unbind('click');
+	ok( !el[0].$events, "Removed the events expando after all handlers are unbound." );
 });
 
 test("trigger(event, [data]", function() {
@@ -55,4 +66,19 @@ test("bind() with data and trigger() with data", function() {
 		ok( data.bar == "foo", "Check value of trigger data" );
 	}
 	$("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]);
+});
+
+test("toggle(Function,Function) assigned from within one('xxx'), see #1054", function() {
+	expect(4);
+	var first = 0;
+	$("#simon1").one("click", function() {
+		ok( true, "Execute event only once" );
+		$(this).toggle(function() {
+			ok( first++ == 0 );
+		}, function() {
+			ok( first == 1 );
+		});
+		return false;
+	}).click().click().click();
+	ok( false, "Seems like this doesn't work (that is, it doesn't fail) when triggering the event programmatically" );
 });
\ No newline at end of file