mirror of https://github.com/gorhill/uBlock.git
Support 'week' unit in `! Expires: ` directive
This commit is contained in:
parent
7cd0ef6ab5
commit
9d1d5f9839
|
@ -53,10 +53,13 @@ let remoteServerFriendly = false;
|
||||||
const stringIsNotEmpty = s => typeof s === 'string' && s !== '';
|
const stringIsNotEmpty = s => typeof s === 'string' && s !== '';
|
||||||
|
|
||||||
const parseExpires = s => {
|
const parseExpires = s => {
|
||||||
const matches = s.match(/(\d+)\s*([dhm]?)/i);
|
const matches = s.match(/(\d+)\s*([wdhm]?)/i);
|
||||||
if ( matches === null ) { return; }
|
if ( matches === null ) { return; }
|
||||||
let updateAfter = parseInt(matches[1], 10);
|
let updateAfter = parseInt(matches[1], 10);
|
||||||
if ( matches[2] === 'h' ) {
|
if ( updateAfter === 0 ) { return; }
|
||||||
|
if ( matches[2] === 'w' ) {
|
||||||
|
updateAfter *= 7 * 24;
|
||||||
|
} else if ( matches[2] === 'h' ) {
|
||||||
updateAfter = Math.max(updateAfter, 4) / 24;
|
updateAfter = Math.max(updateAfter, 4) / 24;
|
||||||
} else if ( matches[2] === 'm' ) {
|
} else if ( matches[2] === 'm' ) {
|
||||||
updateAfter = Math.max(updateAfter, 240) / 1440;
|
updateAfter = Math.max(updateAfter, 240) / 1440;
|
||||||
|
|
Loading…
Reference in New Issue