Cleaned up how event removing was handled. All expandos are now removed when they...

[jquery.git] / src / event / eventTest.js

diff --git a/src/event/eventTest.js b/src/event/eventTest.js
index 01b97c1..cc97999 100644 (file)
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -7,15 +7,15 @@ test("toggle(Function, Function) - add toggle event and fake a few clicks", func
                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,4 @@ 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"}]);
-});
\ No newline at end of file
+});