Selector: Make selector.js module depend on attributes/attr.js

mgol · mgol · commit 01fa7ebcbcb5 · 2024-01-04T01:07:18.000+01:00
This fixes custom builds using the `--include` switch that don't include the `attributes` module. Fixes gh-5379
diff --git a/src/attributes/attr.js b/src/attributes/attr.js
@@ -3,6 +3,7 @@ import { access } from "../core/access.js";
 import { nodeName } from "../core/nodeName.js";
 import { rnothtmlwhite } from "../var/rnothtmlwhite.js";
 import { isIE } from "../var/isIE.js";
+import { rbooleans } from "./var/rbooleans.js";
 
 jQuery.fn.extend( {
 	attr: function( name, value ) {
@@ -97,7 +98,7 @@ if ( isIE ) {
 	};
 }
 
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( _i, name ) {
+jQuery.each( rbooleans.source.match( /\w+/g ), function( _i, name ) {
 	jQuery.attrHooks[ name ] = {
 		get: function( elem ) {
 			var ret,
diff --git a/src/attributes/var/rbooleans.js b/src/attributes/var/rbooleans.js
@@ -0,0 +1 @@
+export var rbooleans = /^(?:checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped)$/i;
diff --git a/src/selector-native.js b/src/selector-native.js
@@ -25,7 +25,6 @@ import { jQuery } from "./core.js";
 import { document } from "./var/document.js";
 import { whitespace } from "./var/whitespace.js";
 import { isIE } from "./var/isIE.js";
-import { booleans } from "./selector/var/booleans.js";
 import { rleadingCombinator } from "./selector/var/rleadingCombinator.js";
 import { rdescend } from "./selector/var/rdescend.js";
 import { rsibling } from "./selector/var/rsibling.js";
@@ -41,7 +40,6 @@ import "./selector/escapeSelector.js";
 import "./selector/uniqueSort.js";
 
 var matchExpr = jQuery.extend( {
-	bool: new RegExp( "^(?:" + booleans + ")$", "i" ),
 	needsContext: new RegExp( "^" + whitespace + "*[>+~]" )
 }, filterMatchExpr );
 
diff --git a/src/selector.js b/src/selector.js
@@ -9,7 +9,6 @@ import { rbuggyQSA } from "./selector/rbuggyQSA.js";
 import { rtrimCSS } from "./var/rtrimCSS.js";
 import { isIE } from "./var/isIE.js";
 import { identifier } from "./selector/var/identifier.js";
-import { booleans } from "./selector/var/booleans.js";
 import { rleadingCombinator } from "./selector/var/rleadingCombinator.js";
 import { rdescend } from "./selector/var/rdescend.js";
 import { rsibling } from "./selector/var/rsibling.js";
@@ -24,6 +23,7 @@ import { tokenize } from "./selector/tokenize.js";
 import { toSelector } from "./selector/toSelector.js";
 
 // The following utils are attached directly to the jQuery object.
+import "./attributes/attr.js";
 import "./selector/escapeSelector.js";
 import "./selector/uniqueSort.js";
 
@@ -50,7 +50,6 @@ var i,
 	ridentifier = new RegExp( "^" + identifier + "$" ),
 
 	matchExpr = jQuery.extend( {
-		bool: new RegExp( "^(?:" + booleans + ")$", "i" ),
 
 		// For use in libraries implementing .is()
 		// We use this for POS matching in `select`
diff --git a/src/selector/var/booleans.js b/src/selector/var/booleans.js

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export var rbooleans = /^(?:checked\|selected\|async\|autofocus\|autoplay\|controls\|defer\|disabled\|hidden\|ismap\|loop\|multiple\|open\|readonly\|required\|scoped)$/i;`