Skip to content

Commit

Permalink
Remove redundancy in the IE special submit handler.
Browse files Browse the repository at this point in the history
  • Loading branch information
dmethvin authored and timmywil committed Sep 19, 2011
1 parent bd55f90 commit 8a6bbc7
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions src/event.js
Expand Up @@ -32,7 +32,7 @@ var rnamespaces = /\.(.*)$/,
(!m[4] || elem.getAttribute( m[4] ) == m[5]) && (!m[4] || elem.getAttribute( m[4] ) == m[5]) &&
(!m[6] || !elem[ m[6] ]) (!m[6] || !elem[ m[6] ])
); );
} };


function useNativeMethod( event ) { function useNativeMethod( event ) {
if ( !event.isDefaultPrevented() && this[ event.type ] ) { if ( !event.isDefaultPrevented() && this[ event.type ] ) {
Expand Down Expand Up @@ -730,25 +730,18 @@ if ( !jQuery.support.submitBubbles ) {


jQuery.event.special.submit = { jQuery.event.special.submit = {
setup: function() { setup: function() {
// Only need this for delegated form submit events
if ( jQuery.nodeName( this, "form" ) ) { if ( jQuery.nodeName( this, "form" ) ) {
return false; return false;
} }


jQuery.event.add(this, "click._submit", function( e ) { jQuery.event.add(this, "click._submit keypress._submit", function( e ) {
var elem = e.target,
type = jQuery.nodeName( elem, "input" ) ? elem.type : "";

trigger( "submit", this, arguments );
if ( (type === "submit" || type === "image") && elem.form ) {
simulate( "submit", this, e );
}
});

jQuery.event.add(this, "keypress._submit", function( e ) {
var elem = e.target, var elem = e.target,
type = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.type : ""; type = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.type : "";


if ( (type === "text" || type === "password") && elem.form && e.keyCode === 13 ) { // Do the elem.form check after type to avoid VML-related crash in IE (#TODO)
if ( (e.type === "click" && (type === "submit" || type === "image") && elem.form) ||
(e.type === "keypress" && e.keyCode === 13 && (type === "text" || type === "password") && elem.form) ) {
simulate( "submit", this, e ); simulate( "submit", this, e );
} }
}); });
Expand Down

0 comments on commit 8a6bbc7

Please sign in to comment.