Permalink
Browse files

Fix #11145: Harden dispatch against a form-aliased "disabled" property

  • Loading branch information...
1 parent b6a2dfb commit 77de76b942bf6bde5cf17ddad15b03049c92e6be @gibson042 gibson042 committed with dmethvin Jan 12, 2012
Showing with 24 additions and 11 deletions.
  1. +1 −1 src/event.js
  2. +23 −10 test/unit/event.js
View
2 src/event.js
@@ -399,7 +399,7 @@ jQuery.event = {
// Determine handlers that should run if there are delegated events
// Avoid disabled elements in IE (#6911) and non-left-click bubbling in Firefox (#3861)
- if ( delegateCount && !event.target.disabled && !(event.button && event.type === "click") ) {
+ if ( delegateCount && event.target.disabled !== true && !(event.button && event.type === "click") ) {
// Pregenerate a single jQuery object for reuse with .is()
jqcur = jQuery(this);
View
33 test/unit/event.js
@@ -1213,25 +1213,38 @@ test("Delegated events in SVG (#10791)", function() {
svg.remove();
});
-test("Delegated events in forms (#10844)", function() {
- expect(1);
+test("Delegated events in forms (#10844; #11145)", function() {
+ expect(2);
// Aliases names like "id" cause havoc
var form = jQuery(
'<form id="myform">'+
'<input type="text" name="id" value="secret agent man" />'+
'</form>'
- ).appendTo( "body" );
-
- jQuery( "body" )
+ )
+ .on( "submit", function( event ) {
+ event.preventDefault();
+ })
+ .appendTo("body");
+
+ jQuery("body")
+ .on( "submit", "#myform", function() {
+ ok( true, "delegated id selector with aliased id" );
+ })
+ .find("#myform")
+ .trigger("submit")
+ .end()
+ .off("submit");
+
+ form.append('<input type="text" name="disabled" value="differently abled" />');
+ jQuery("body")
.on( "submit", "#myform", function() {
- ok( true, "delegated id selector with aliased name" );
- return false;
+ ok( true, "delegated id selector with aliased disabled" );
})
- .find( "#myform" )
- .trigger( "submit" )
+ .find("#myform")
+ .trigger("submit")
.end()
- .off( "submit" );
+ .off("submit");
form.remove();
});

0 comments on commit 77de76b

Please sign in to comment.