diff options
| author | Dave Methvin <dave.methvin@gmail.com> | 2011-04-05 21:59:09 -0400 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2011-04-05 21:59:09 -0400 |
| commit | c1316a4cb1fa9b9f85ef96f0e2ce45768ccd59cd (patch) | |
| tree | 6f13836844c8c45ae6ccaf297079979f21ae80dd | |
| parent | b5c7c507c1617ada4b47fd2973dc42c6543f9cf2 (diff) | |
| download | jquery-c1316a4cb1fa9b9f85ef96f0e2ce45768ccd59cd.tar.gz jquery-c1316a4cb1fa9b9f85ef96f0e2ce45768ccd59cd.zip | |
Shorten up the code and do event cleanup on test cases.
| -rw-r--r-- | src/event.js | 11 | ||||
| -rw-r--r-- | test/unit/event.js | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/event.js b/src/event.js index 9164bd67d..b8de9386b 100644 --- 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 48a97a1db..0b4b364bc 100644 --- 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() { |