From 063831b6378d518f9870ec5c4f1e7d5d16e04f36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Go=C5=82=C4=99biowski-Owczarek?= Date: Wed, 20 Mar 2024 00:46:30 +0100 Subject: [PATCH] Attributes: Make `.attr( name, false )` remove for all non-ARIA attrs The HTML spec defines boolean attributes: https://html.spec.whatwg.org/#boolean-attributes that often correlate with boolean properties. If the attribute is missing, it correlates with the `false` property value, if it's present - the `true` property value. The only valid values are an empty string or the attribute name. jQuery tried to be helpful here and treated boolean attributes in a special way in the `.attr()` API: 1. For the getter, as long as the attribute was present, it was returning the attribute name lowercased, ignoring the value. 2. For the setter, it was removing the attribute when `false` was passed; otherwise, it was ignoring the passed value and set the attribute - interestingly, in jQuery `>=3` not lowercased anymore. The problem is the spec occasionally converts boolean attributes into ones with additional attribute values with special behavior - one such example is the new `"until-found"` value for the `hidden` attribute. Our setter normalization means passing those values is impossible with jQuery. Also, new boolean attributes are introduced occasionally and jQuery cannot easily add them to the list without incurring breaking changes. This patch removes any special handling of boolean attributes - the getter returns the value as-is and the setter sets the provided value. To provide better backwards compatibility with the very frequent `false` value provided to remove the attribute, this patch makes `false` trigger attribute removal for ALL non-ARIA attributes. ARIA attributes are exempt from the rule since many of them recognize `"false"` as a valid value with semantics different than the attribute missing. To remove an ARIA attribute, use `.removeAttr()` or pass `null` as the value to `.attr()` which doesn't have this exception. Fixes gh-5388 Closes gh-5452 Co-authored-by: Richard Gibson --- src/attributes/attr.js | 38 ++++-------------- test/unit/attributes.js | 86 ++++++++++++++++++++++++++++++++++------- test/unit/selector.js | 8 ++-- 3 files changed, 84 insertions(+), 48 deletions(-) diff --git a/src/attributes/attr.js b/src/attributes/attr.js index 426a8e524..118895916 100644 --- a/src/attributes/attr.js +++ b/src/attributes/attr.js @@ -38,7 +38,14 @@ jQuery.extend( { } if ( value !== undefined ) { - if ( value === null ) { + if ( value === null || + + // For compat with previous handling of boolean attributes, + // remove when `false` passed. For ARIA attributes - + // many of which recognize a `"false"` value - continue to + // set the `"false"` value as jQuery <4 did. + ( value === false && name.toLowerCase().indexOf( "aria-" ) !== 0 ) ) { + jQuery.removeAttr( elem, name ); return; } @@ -96,32 +103,3 @@ if ( isIE ) { } }; } - -// HTML boolean attributes have special behavior: -// we consider the lowercase name to be the only valid value, so -// getting (if the attribute is present) normalizes to that, as does -// setting to any non-`false` value (and setting to `false` removes the attribute). -// See https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#boolean-attributes -jQuery.each( ( - "checked selected async autofocus autoplay controls defer disabled " + - "hidden ismap loop multiple open readonly required scoped" -).split( " " ), function( _i, name ) { - jQuery.attrHooks[ name ] = { - get: function( elem ) { - return elem.getAttribute( name ) != null ? - name.toLowerCase() : - null; - }, - - set: function( elem, value, name ) { - if ( value === false ) { - - // Remove boolean attributes when set to false - jQuery.removeAttr( elem, name ); - } else { - elem.setAttribute( name, name ); - } - return name; - } - }; -} ); diff --git a/test/unit/attributes.js b/test/unit/attributes.js index b9647e6a7..477f3464a 100644 --- a/test/unit/attributes.js +++ b/test/unit/attributes.js @@ -304,12 +304,12 @@ QUnit.test( "attr(String, Object)", function( assert ) { assert.equal( $input[ 0 ].selected, true, "Setting selected updates property (verified by native property)" ); $input = jQuery( "#check2" ); - $input.prop( "checked", true ).prop( "checked", false ).attr( "checked", true ); + $input.prop( "checked", true ).prop( "checked", false ).attr( "checked", "checked" ); assert.equal( $input.attr( "checked" ), "checked", "Set checked (verified by .attr)" ); $input.prop( "checked", false ).prop( "checked", true ).attr( "checked", false ); assert.equal( $input.attr( "checked" ), undefined, "Remove checked (verified by .attr)" ); - $input = jQuery( "#text1" ).prop( "readOnly", true ).prop( "readOnly", false ).attr( "readonly", true ); + $input = jQuery( "#text1" ).prop( "readOnly", true ).prop( "readOnly", false ).attr( "readonly", "readonly" ); assert.equal( $input.attr( "readonly" ), "readonly", "Set readonly (verified by .attr)" ); $input.prop( "readOnly", false ).prop( "readOnly", true ).attr( "readonly", false ); assert.equal( $input.attr( "readonly" ), undefined, "Remove readonly (verified by .attr)" ); @@ -318,7 +318,7 @@ QUnit.test( "attr(String, Object)", function( assert ) { assert.equal( $input[ 0 ].checked, true, "Set checked property (verified by native property)" ); assert.equal( $input.prop( "checked" ), true, "Set checked property (verified by .prop)" ); assert.equal( $input.attr( "checked" ), undefined, "Setting checked property doesn't affect checked attribute" ); - $input.attr( "checked", false ).attr( "checked", true ).prop( "checked", false ); + $input.attr( "checked", false ).attr( "checked", "checked" ).prop( "checked", false ); assert.equal( $input[ 0 ].checked, false, "Clear checked property (verified by native property)" ); assert.equal( $input.prop( "checked" ), false, "Clear checked property (verified by .prop)" ); assert.equal( $input.attr( "checked" ), "checked", "Clearing checked property doesn't affect checked attribute" ); @@ -345,8 +345,8 @@ QUnit.test( "attr(String, Object)", function( assert ) { // HTML5 boolean attributes $text = jQuery( "#text1" ).attr( { - "autofocus": true, - "required": true + "autofocus": "autofocus", + "required": "required" } ); assert.equal( $text.attr( "autofocus" ), "autofocus", "Reading autofocus attribute yields 'autofocus'" ); assert.equal( $text.attr( "autofocus", false ).attr( "autofocus" ), undefined, "Setting autofocus to false removes it" ); @@ -354,13 +354,13 @@ QUnit.test( "attr(String, Object)", function( assert ) { assert.equal( $text.attr( "required", false ).attr( "required" ), undefined, "Setting required attribute to false removes it" ); $details = jQuery( "
" ).appendTo( "#qunit-fixture" ); - assert.equal( $details.attr( "open" ), "open", "open attribute presence indicates true" ); + assert.equal( $details.attr( "open" ), "", "open attribute presence indicates true" ); assert.equal( $details.attr( "open", false ).attr( "open" ), undefined, "Setting open attribute to false removes it" ); $text.attr( "data-something", true ); assert.equal( $text.attr( "data-something" ), "true", "Set data attributes" ); assert.equal( $text.data( "something" ), true, "Setting data attributes are not affected by boolean settings" ); - $text.attr( "data-another", false ); + $text.attr( "data-another", "false" ); assert.equal( $text.attr( "data-another" ), "false", "Set data attributes" ); assert.equal( $text.data( "another" ), false, "Setting data attributes are not affected by boolean settings" ); assert.equal( $text.attr( "aria-disabled", false ).attr( "aria-disabled" ), "false", "Setting aria attributes are not affected by boolean settings" ); @@ -1790,14 +1790,12 @@ QUnit.test( "non-lowercase boolean attribute getters should not crash", function var elem = jQuery( "" ); - jQuery.each( { - checked: "Checked", - required: "requiRed", - autofocus: "AUTOFOCUS" - }, function( lowercased, original ) { + [ + "Checked", "requiRed", "AUTOFOCUS" + ].forEach( function( inconsistentlyCased ) { try { - assert.strictEqual( elem.attr( original ), lowercased, - "The '" + this + "' attribute getter should return the lowercased name" ); + assert.strictEqual( elem.attr( inconsistentlyCased ), "", + "The '" + this + "' attribute getter should return an empty string" ); } catch ( e ) { assert.ok( false, "The '" + this + "' attribute getter threw" ); } @@ -1805,6 +1803,66 @@ QUnit.test( "non-lowercase boolean attribute getters should not crash", function } ); +QUnit.test( "false setter removes non-ARIA attrs (gh-5388)", function( assert ) { + assert.expect( 24 ); + + var elem = jQuery( "