diff options
| author | John Resig <jeresig@gmail.com> | 2010-10-09 18:04:54 -0400 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2010-10-09 18:04:54 -0400 |
| commit | 10065a8deb471c358c53e4852025b0ac8a9c5d32 (patch) | |
| tree | 824710e1a1ba03a68e31309ffe9486452dc0441e /src/event.js | |
| parent | 4a0759dc79fd0ad540d946c346a5afe9ce9db4ad (diff) | |
| parent | 3bd737e81a7f5806f73c078aa8e3bebc2fb9c6d0 (diff) | |
| download | jquery-10065a8deb471c358c53e4852025b0ac8a9c5d32.tar.gz jquery-10065a8deb471c358c53e4852025b0ac8a9c5d32.zip | |
Merge branch 'master' of http://github.com/petersendidit/jquery into petersendidit-master
Diffstat (limited to 'src/event.js')
| -rw-r--r-- | src/event.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/event.js b/src/event.js index 5829948e6..d62d2291c 100644 --- a/src/event.js +++ b/src/event.js @@ -706,6 +706,7 @@ if ( !jQuery.support.submitBubbles ) { var elem = e.target, type = elem.type; if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) { + e.liveFired = undefined; return trigger( "submit", this, arguments ); } }); @@ -714,6 +715,7 @@ if ( !jQuery.support.submitBubbles ) { var elem = e.target, type = elem.type; if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) { + e.liveFired = undefined; return trigger( "submit", this, arguments ); } }); |