From: John Resig Date: Mon, 6 Dec 2010 22:19:30 +0000 (-0500) Subject: Merge branch 't6398' of https://github.com/jitter/jquery into jitter-t6398 X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=b00ab56160a75c6aa3fdd21807c951ac8098aabc;hp=-c;p=jquery.git Merge branch 't6398' of https://github.com/jitter/jquery into jitter-t6398 --- b00ab56160a75c6aa3fdd21807c951ac8098aabc diff --combined src/event.js index 58a6953,75ac0ba..fd470e7 --- a/src/event.js +++ b/src/event.js @@@ -716,7 -716,7 +716,7 @@@ if ( !jQuery.support.submitBubbles ) jQuery.event.special.submit = { setup: function( data, namespaces ) { - if ( this.nodeName.toLowerCase() !== "form" ) { + if ( this.nodeName && this.nodeName.toLowerCase() !== "form" ) { jQuery.event.add(this, "click.specialSubmit", function( e ) { var elem = e.target, type = elem.type; @@@ -1075,8 -1075,8 +1075,8 @@@ function liveHandler( event ) events = events.events; } - // Make sure we avoid non-left-click bubbling in Firefox (#3861) - if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) { + // Make sure we avoid non-left-click bubbling in Firefox (#3861) and disabled elements in IE (#6911) + if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) { return; }