Merge branch 'master' of http://github.com/petersendidit/jquery into petersendidit-master
This commit is contained in:
commit
10065a8deb
|
@ -706,6 +706,7 @@ if ( !jQuery.support.submitBubbles ) {
|
||||||
var elem = e.target, type = elem.type;
|
var elem = e.target, type = elem.type;
|
||||||
|
|
||||||
if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
|
if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
|
||||||
|
e.liveFired = undefined;
|
||||||
return trigger( "submit", this, arguments );
|
return trigger( "submit", this, arguments );
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -714,6 +715,7 @@ if ( !jQuery.support.submitBubbles ) {
|
||||||
var elem = e.target, type = elem.type;
|
var elem = e.target, type = elem.type;
|
||||||
|
|
||||||
if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
|
if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
|
||||||
|
e.liveFired = undefined;
|
||||||
return trigger( "submit", this, arguments );
|
return trigger( "submit", this, arguments );
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue