Merge branch 'master' of github.com:gorhill/uBlock

This commit is contained in:
Raymond Hill 2018-04-06 16:02:41 -04:00
commit a015ad0a5c
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 2 additions and 2 deletions

View File

@ -733,7 +733,7 @@
// https://github.com/gorhill/uBlock/issues/313
// Always try to fetch the name if this is an external filter list.
if ( listEntry.title === '' || listEntry.group === 'custom' ) {
matches = head.match(/(?:^|\n)!\s*Title:([^\n]+)/i);
matches = head.match(/(?:^|\n)(?:!|# )\s*Title:([^\n]+)/i);
if ( matches !== null ) {
// https://bugs.chromium.org/p/v8/issues/detail?id=2869
// JSON.stringify/JSON.parse is to work around String.slice()
@ -743,7 +743,7 @@
}
}
// Extract update frequency information
matches = head.match(/(?:^|\n)![\t ]*Expires:[\t ]*([\d]+)[\t ]*days?/i);
matches = head.match(/(?:^|\n)(?:!|# )[\t ]*Expires:[\t ]*(\d+)[\t ]*day/i);
if ( matches !== null ) {
v = Math.max(parseInt(matches[1], 10), 1);
if ( v !== listEntry.updateAfter ) {