add :where(), remove :matches()

This commit is contained in:
tophf 2020-06-26 06:42:34 +03:00
parent 4e146d0e54
commit e1a369f283

View File

@ -1430,8 +1430,8 @@ self.parserlib = (() => {
// modifier // modifier
NOT: {}, NOT: {},
ANY: {text: ['any', '-webkit-any', '-moz-any']}, ANY: {text: ['any', '-webkit-any', '-moz-any']},
MATCHES: {},
IS: {}, IS: {},
WHERE: {},
/* /*
* Defined in CSS3 Paged Media * Defined in CSS3 Paged Media
@ -3043,8 +3043,8 @@ self.parserlib = (() => {
* Potential tokens: * Potential tokens:
* - ANY * - ANY
* - IS * - IS
* - MATCHES
* - NOT * - NOT
* - WHERE
* - CHAR * - CHAR
*/ */
case ':': case ':':
@ -3258,18 +3258,18 @@ self.parserlib = (() => {
// NOT // NOT
// IS // IS
// ANY // ANY
// MATCHES
// CHAR // CHAR
notOrIsToken(first, pos) { notOrIsToken(first, pos) {
// first is always ':' // first is always ':'
const reader = this._reader; const reader = this._reader;
const func = reader.readMatch(/(not|is|(-(moz|webkit)-)?(any|matches))\(/iy); const func = reader.readMatch(/(not|is|where|(-(moz|webkit)-)?any)\(/iy);
if (func) { if (func) {
const lcase = func[0].toLowerCase(); const lcase = func[0].toLowerCase();
const type = const type =
lcase === 'n' ? Tokens.NOT : lcase === 'n' ? Tokens.NOT :
lcase === 'i' ? Tokens.IS : lcase === 'i' ? Tokens.IS :
lcase === 'm' ? Tokens.MATCHES : Tokens.ANY; lcase === 'w' ? Tokens.WHERE :
Tokens.ANY;
return this.createToken(type, first + func, pos); return this.createToken(type, first + func, pos);
} }
return this.charToken(first, pos); return this.charToken(first, pos);
@ -4713,7 +4713,7 @@ self.parserlib = (() => {
_is() { _is() {
const stream = this._tokenStream; const stream = this._tokenStream;
if (!stream.match([Tokens.IS, Tokens.ANY, Tokens.MATCHES])) return null; if (!stream.match([Tokens.IS, Tokens.ANY, Tokens.WHERE])) return null;
let arg; let arg;
const start = stream._token; const start = stream._token;
@ -5448,7 +5448,7 @@ self.parserlib = (() => {
[Tokens.COLON, Parser.prototype._pseudo], [Tokens.COLON, Parser.prototype._pseudo],
[Tokens.IS, Parser.prototype._is], [Tokens.IS, Parser.prototype._is],
[Tokens.ANY, Parser.prototype._is], [Tokens.ANY, Parser.prototype._is],
[Tokens.MATCHES, Parser.prototype._is], [Tokens.WHERE, Parser.prototype._is],
[Tokens.NOT, Parser.prototype._negation], [Tokens.NOT, Parser.prototype._negation],
]), ]),
}; };