mirror of
https://github.com/gorhill/uBlock.git
synced 2024-09-15 15:32:28 +02:00
Rename 1P
/3P
tp strict1p
/strict3p
as suggested
Related issue: - https://github.com/uBlockOrigin/uBlock-issues/issues/1362
This commit is contained in:
parent
b319dc98f8
commit
60d5b85e41
@ -232,21 +232,12 @@ CodeMirror.defineMode('ubo-static-filtering', function() {
|
|||||||
parserSlot += 3;
|
parserSlot += 3;
|
||||||
return 'def';
|
return 'def';
|
||||||
}
|
}
|
||||||
const to = parser.skipUntil(
|
parserSlot = parser.skipUntil(
|
||||||
parserSlot,
|
parserSlot,
|
||||||
parser.commentSpan.i,
|
parser.commentSpan.i,
|
||||||
parser.BITComma | parser.BITEqual
|
parser.BITComma | parser.BITEqual
|
||||||
);
|
);
|
||||||
if (
|
stream.pos = parser.slices[parserSlot+1];
|
||||||
to > parserSlot &&
|
|
||||||
/^[13]P/.test(parser.strFromSlices(parserSlot, to - 3))
|
|
||||||
) {
|
|
||||||
parserSlot = to;
|
|
||||||
stream.pos = parser.slices[to+1];
|
|
||||||
return 'def notice';
|
|
||||||
}
|
|
||||||
parserSlot = to;
|
|
||||||
stream.pos = parser.slices[to+1];
|
|
||||||
return 'def';
|
return 'def';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2054,10 +2054,10 @@ Parser.prototype.OPTNotSupported = OPTNotSupported;
|
|||||||
const netOptionTokenDescriptors = new Map([
|
const netOptionTokenDescriptors = new Map([
|
||||||
[ '1p', OPTToken1p | OPTCanNegate ],
|
[ '1p', OPTToken1p | OPTCanNegate ],
|
||||||
[ 'first-party', OPTToken1p | OPTCanNegate ],
|
[ 'first-party', OPTToken1p | OPTCanNegate ],
|
||||||
[ '1P', OPTToken1pStrict ],
|
[ 'strict1p', OPTToken1pStrict ],
|
||||||
[ '3p', OPTToken3p | OPTCanNegate ],
|
[ '3p', OPTToken3p | OPTCanNegate ],
|
||||||
[ 'third-party', OPTToken3p | OPTCanNegate ],
|
[ 'third-party', OPTToken3p | OPTCanNegate ],
|
||||||
[ '3P', OPTToken3pStrict ],
|
[ 'strict3p', OPTToken3pStrict ],
|
||||||
[ 'all', OPTTokenAll | OPTNetworkType | OPTNonCspableType ],
|
[ 'all', OPTTokenAll | OPTNetworkType | OPTNonCspableType ],
|
||||||
[ 'badfilter', OPTTokenBadfilter ],
|
[ 'badfilter', OPTTokenBadfilter ],
|
||||||
[ 'cname', OPTTokenCname | OPTAllowOnly | OPTModifierType ],
|
[ 'cname', OPTTokenCname | OPTAllowOnly | OPTModifierType ],
|
||||||
@ -2109,10 +2109,10 @@ Parser.prototype.netOptionTokenDescriptors =
|
|||||||
Parser.netOptionTokenIds = new Map([
|
Parser.netOptionTokenIds = new Map([
|
||||||
[ '1p', OPTToken1p ],
|
[ '1p', OPTToken1p ],
|
||||||
[ 'first-party', OPTToken1p ],
|
[ 'first-party', OPTToken1p ],
|
||||||
[ '1P', OPTToken1pStrict ],
|
[ 'strict1p', OPTToken1pStrict ],
|
||||||
[ '3p', OPTToken3p ],
|
[ '3p', OPTToken3p ],
|
||||||
[ 'third-party', OPTToken3p ],
|
[ 'third-party', OPTToken3p ],
|
||||||
[ '3P', OPTToken3pStrict ],
|
[ 'strict3p', OPTToken3pStrict ],
|
||||||
[ 'all', OPTTokenAll ],
|
[ 'all', OPTTokenAll ],
|
||||||
[ 'badfilter', OPTTokenBadfilter ],
|
[ 'badfilter', OPTTokenBadfilter ],
|
||||||
[ 'cname', OPTTokenCname ],
|
[ 'cname', OPTTokenCname ],
|
||||||
@ -2160,9 +2160,9 @@ Parser.netOptionTokenIds = new Map([
|
|||||||
|
|
||||||
Parser.netOptionTokenNames = new Map([
|
Parser.netOptionTokenNames = new Map([
|
||||||
[ OPTToken1p, '1p' ],
|
[ OPTToken1p, '1p' ],
|
||||||
[ OPTToken1pStrict, '1P' ],
|
[ OPTToken1pStrict, 'strict1p' ],
|
||||||
[ OPTToken3p, '3p' ],
|
[ OPTToken3p, '3p' ],
|
||||||
[ OPTToken3pStrict, '3P' ],
|
[ OPTToken3pStrict, 'strict3p' ],
|
||||||
[ OPTTokenAll, 'all' ],
|
[ OPTTokenAll, 'all' ],
|
||||||
[ OPTTokenBadfilter, 'badfilter' ],
|
[ OPTTokenBadfilter, 'badfilter' ],
|
||||||
[ OPTTokenCname, 'cname' ],
|
[ OPTTokenCname, 'cname' ],
|
||||||
|
Loading…
Reference in New Issue
Block a user