Make sure that .die() with no args works. Fixes #5789.

[jquery.git] / test / unit / event.js

diff --git a/test/unit/event.js b/test/unit/event.js
index 80a2e6a..99ed419 100644 (file)
--- 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(61);
+       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
@@ -857,6 +864,35 @@ test(".live()/.die()", function() {
        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(){
        var selectChange = 0, checkboxChange = 0;
        
@@ -873,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
@@ -903,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);
@@ -920,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);
@@ -937,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);
@@ -954,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." );
 });