X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=99ed419363db1ef58577075a5129b0fb51a9a10a;hb=3e286440d55749382a644ea97b4f0b2587779d65;hp=1ad7c3d0ca876b578d68a7746ef8fdfddae8a268;hpb=d42afd0f657d12d6daba6894d40226bea83fe1b6;p=jquery.git diff --git a/test/unit/event.js b/test/unit/event.js index 1ad7c3d..99ed419 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -232,8 +232,8 @@ test("bind(), with different this object", function() { }; jQuery("#firstp") - .bind("click", handler1, thisObject).click().unbind("click", handler1) - .bind("click", data, handler2, thisObject).click().unbind("click", handler2); + .bind("click", jQuery.proxy(handler1, thisObject)).click().unbind("click", handler1) + .bind("click", data, jQuery.proxy(handler2, thisObject)).click().unbind("click", handler2); ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data." ); }); @@ -608,7 +608,7 @@ test("toggle(Function, Function, ...)", function() { }); test(".live()/.die()", function() { - expect(58); + expect(62); var submit = 0, div = 0, livea = 0, liveb = 0; @@ -675,6 +675,13 @@ test(".live()/.die()", function() { equals( livea, 6, "stopPropagation Click on inner div" ); equals( liveb, 3, "stopPropagation Click on inner div" ); + // Make sure click events only fire with primary click + var event = jQuery.Event("click"); + event.button = 1; + jQuery("div#nothiddendiv").trigger(event); + + equals( livea, 6, "live secondary click" ); + jQuery("div#nothiddendivchild").die("click"); jQuery("div#nothiddendiv").die("click"); jQuery("div").die("click"); @@ -706,15 +713,15 @@ test(".live()/.die()", function() { 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").live("click", jQuery.proxy(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){ + jQuery("#foo").live("click", true, jQuery.proxy(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" }); + }, { foo: "bar" })); jQuery("#foo").trigger("click", true).die("click"); // Verify that return false prevents default action @@ -818,6 +825,72 @@ test(".live()/.die()", function() { jQuery('span#liveSpan1 a').click(); jQuery('span#liveSpan1').die('click'); + + // Work with deep selectors + livee = 0; + + function clickB(){ livee++; } + + jQuery("#nothiddendiv div").live("click", function(){ livee++; }); + jQuery("#nothiddendiv div").live("click", clickB); + jQuery("#nothiddendiv div").live("mouseover", function(){ livee++; }); + + equals( livee, 0, "No clicks, deep selector." ); + + livee = 0; + jQuery("#nothiddendivchild").trigger("click"); + equals( livee, 2, "Click, deep selector." ); + + livee = 0; + jQuery("#nothiddendivchild").trigger("mouseover"); + equals( livee, 1, "Mouseover, deep selector." ); + + jQuery("#nothiddendiv div").die("mouseover"); + + livee = 0; + jQuery("#nothiddendivchild").trigger("click"); + equals( livee, 2, "Click, deep selector." ); + + livee = 0; + jQuery("#nothiddendivchild").trigger("mouseover"); + equals( livee, 0, "Mouseover, deep selector." ); + + jQuery("#nothiddendiv div").die("click", clickB); + + livee = 0; + jQuery("#nothiddendivchild").trigger("click"); + equals( livee, 1, "Click, deep selector." ); + + jQuery("#nothiddendiv div").die("click"); +}); + +test("die all bound events", function(){ + expect(1); + + var count = 0; + var div = jQuery("div#nothiddendivchild"); + + div.live("click submit", function(){ count++; }); + div.die(); + + div.trigger("click"); + div.trigger("submit"); + + equals( count, 0, "Make sure no events were triggered." ); +}); + +test("live with multiple events", function(){ + expect(1); + + var count = 0; + var div = jQuery("div#nothiddendivchild"); + + div.live("click submit", function(){ count++; }); + + div.trigger("click"); + div.trigger("submit"); + + equals( count, 2, "Make sure both the click and submit were triggered." ); }); test("live with change", function(){ @@ -836,26 +909,20 @@ test("live with change", function(){ // test click on select - // first click sets data - if ( !jQuery.support.changeBubbles ) { - select[0].selectedIndex = 1; - select.trigger("keyup"); - } - // second click that changed it selectChange = 0; select[0].selectedIndex = select[0].selectedIndex ? 0 : 1; - select.trigger(jQuery.support.changeBubbles ? "change" : "click"); + select.trigger("change"); equals( selectChange, 1, "Change on click." ); // test keys on select selectChange = 0; select[0].selectedIndex = select[0].selectedIndex ? 0 : 1; - select.trigger(jQuery.support.changeBubbles ? "change" : "keyup"); + select.trigger("change"); equals( selectChange, 1, "Change on keyup." ); // test click on checkbox - checkbox.trigger(jQuery.support.changeBubbles ? "change" : "click"); + checkbox.trigger("change"); equals( checkboxChange, 1, "Change on checkbox." ); // test before activate on radio @@ -866,12 +933,8 @@ test("live with change", function(){ textareaChange++; }); - if ( !jQuery.support.changeBubbles ) { - textarea.trigger("focus"); - } - textarea.val(oldVal + "foo"); - textarea.trigger(jQuery.support.changeBubbles ? "change" : "blur"); + textarea.trigger("change"); equals( textareaChange, 1, "Change on textarea." ); textarea.val(oldVal); @@ -883,12 +946,8 @@ test("live with change", function(){ textChange++; }); - if ( !jQuery.support.changeBubbles ) { - text.trigger("focus"); - } - text.val(oldVal+"foo"); - text.trigger(jQuery.support.changeBubbles ? "change" : "blur"); + text.trigger("change"); equals( textChange, 1, "Change on text input." ); text.val(oldTextVal); @@ -900,12 +959,8 @@ test("live with change", function(){ passwordChange++; }); - if ( !jQuery.support.changeBubbles ) { - password.trigger("focus"); - } - password.val(oldPasswordVal + "foo"); - password.trigger(jQuery.support.changeBubbles ? "change" : "blur"); + password.trigger("change"); equals( passwordChange, 1, "Change on password input." ); password.val(oldPasswordVal); @@ -917,17 +972,17 @@ test("live with change", function(){ selectChange = 0; select.die("change"); select[0].selectedIndex = select[0].selectedIndex ? 0 : 1; - select.trigger(jQuery.support.changeBubbles ? "change" : "click"); + select.trigger("change"); equals( selectChange, 0, "Die on click works." ); selectChange = 0; select[0].selectedIndex = select[0].selectedIndex ? 0 : 1; - select.trigger(jQuery.support.changeBubbles ? "change" : "keyup"); + select.trigger("change"); equals( selectChange, 0, "Die on keyup works." ); // die specific checkbox checkbox.die("change", checkboxFunction); - checkbox.trigger(jQuery.support.changeBubbles ? "change" : "click"); + checkbox.trigger("change"); equals( checkboxChange, 1, "Die on checkbox." ); });