Shorten up the code and do event cleanup on test cases.

diff --git a/src/event.js b/src/event.js
index 9164bd67dcf288bd1c3c854930e1b326d3152549..b8de9386ba9248fdf35246030b00dc1404a65e76 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -1027,15 +1027,10 @@ jQuery.each(["live", "die"], function( i, name ) {
                        return this;
                }
 
-               if ( jQuery.isFunction( data ) || data === false ) {
-                       fn = data;
+               if ( data === false || jQuery.isFunction( data ) ) {
+                       fn = data || returnFalse;
                        data = undefined;
-               }
-               
-               if ( fn === false ) {
-                       fn = returnFalse;
-               }
-                               
+               }       
 
                types = (types || "").split(" ");
 

diff --git a/test/unit/event.js b/test/unit/event.js
index 48a97a1db77c41cf6e66a455e2e9f90f2584b4ab..0b4b364bca814a9d35b82a82c5f8e6cc0f6d02f8 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -567,6 +567,7 @@ test("live(name, false), die(name, false)", function() {
        jQuery("#ap").die("click", false);
        jQuery("#ap").trigger("click");
        equals( main, 1, "Verify that the trigger happened correctly." );
+       jQuery("#main").die("click");
 });
 
 test("delegate(selector, name, false), undelegate(selector, name, false)", function() {
@@ -587,6 +588,7 @@ test("delegate(selector, name, false), undelegate(selector, name, false)", funct
        jQuery("#ap").undelegate("#groups", "click", false);
        jQuery("#groups").trigger("click");
        equals( main, 1, "Verify that the trigger happened correctly." );
+       jQuery("#main").undelegate("#ap", "click");
 });
 
 test("bind()/trigger()/unbind() on plain object", function() {