Fix #8165: Ignore events bubbling through disabled elements.

Although #6911 fixed the case where event.target was disabled, it missed the case where the target was a sub-element.

1 files changed, 12 insertions, 2 deletions

diff --git a/test/unit/event.js b/test/unit/event.js
index 0932ce816..4c1901664 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1213,8 +1213,8 @@ test("Delegated events in SVG (#10791)", function() {
 	svg.remove();
 });
 
-test("Delegated events in forms (#10844; #11145)", function() {
-	expect(2);
+test("Delegated events in forms (#10844; #11145; #8165)", function() {
+	expect(3);
 
 	// Aliases names like "id" cause havoc
 	var form = jQuery(
@@ -1246,6 +1246,16 @@ test("Delegated events in forms (#10844; #11145)", function() {
 		.end()
 		.off("submit");
 
+	form
+		.append( '<button id="nestyDisabledBtn"><span>Zing</span></button>' )
+		.on( "click", "#nestyDisabledBtn", function() {
+			ok( true, "enabled/disabled button with nesty elements" );
+		})
+		.find( "span" ).trigger( "click" ).end()	// yep
+		.find( "#nestyDisabledBtn" ).prop( "disabled", true ).end()
+		.find( "span" ).trigger( "click" ).end()	// nope
+		.off( "click" );
+
 	form.remove();
 });