aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2011-04-05 21:59:09 -0400
committerDave Methvin <dave.methvin@gmail.com>2011-04-05 21:59:09 -0400
commitc1316a4cb1fa9b9f85ef96f0e2ce45768ccd59cd (patch)
tree6f13836844c8c45ae6ccaf297079979f21ae80dd /src
parentb5c7c507c1617ada4b47fd2973dc42c6543f9cf2 (diff)
downloadjquery-c1316a4cb1fa9b9f85ef96f0e2ce45768ccd59cd.tar.gz
jquery-c1316a4cb1fa9b9f85ef96f0e2ce45768ccd59cd.zip
Shorten up the code and do event cleanup on test cases.
Diffstat (limited to 'src')
-rw-r--r--src/event.js11
1 files changed, 3 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(" ");