Selector: Properly implement :enabled/:disabled for select contents

SemVer patch Fixes jquerygh-387 Ref jquery/jquery#3263 Closes jquerygh-388
tosmolka · Aug 8, 2016 · ff1c731 · ff1c731
1 parent 281a6ff
commit ff1c731
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/dist/sizzle.js b/dist/sizzle.js
@@ -179,7 +179,7 @@ var i,
 
 	disabledAncestor = addCombinator(
 		function( elem ) {
-			return elem.disabled === true;
+			return elem.disabled === true && ("form" in elem || "label" in elem);
 		},
 		{ dir: "parentNode", next: "legend" }
 	);

diff --git a/dist/sizzle.min.js b/dist/sizzle.min.js
diff --git a/dist/sizzle.min.map b/dist/sizzle.min.map
diff --git a/src/sizzle.js b/src/sizzle.js
@@ -179,7 +179,7 @@ var i,
 
 	disabledAncestor = addCombinator(
 		function( elem ) {
-			return elem.disabled === true;
+			return elem.disabled === true && ("form" in elem || "label" in elem);
 		},
 		{ dir: "parentNode", next: "legend" }
 	);

diff --git a/test/unit/selector.js b/test/unit/selector.js
@@ -1088,6 +1088,16 @@ QUnit.test("pseudo - form", function( assert ) {
 QUnit.test("pseudo - :(dis|en)abled, explicitly disabled", function( assert ) {
 	assert.expect( 2 );
 
+	// Set a meaningless disabled property on a common ancestor
+	var container = document.getElementById( "disabled-tests" );
+	container.disabled = true;
+
+	// Support: IE 6 - 11
+	// Unset the property where it is not meaningless
+	if ( document.getElementById( "enabled-input" ).isDisabled ) {
+		container.disabled = undefined;
+	}
+
 	t(
 		"Explicitly disabled elements",
 		"#enabled-fieldset :disabled",