Unified Diff: lib/abp2blocklist.js
Issue 29467595:
Issue 5325 - Add support for separator characters (Closed)
Base URL: https://hg.adblockplus.org/abp2blocklist
Patch Set: Wrap long lines
Created July 9, 2017, 10:48 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
test/abp2blocklist.js » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: lib/abp2blocklist.js |
| =================================================================== |
| --- a/lib/abp2blocklist.js |
| +++ b/lib/abp2blocklist.js |
| @@ -143,18 +143,23 @@ |
| switch (c) |
| { |
| case "*": |
| if (regexp.length > 0 && i < lastIndex && text[i + 1] != "*") |
| regexp.push(".*"); |
| break; |
| case "^": |
| - if (i < lastIndex) |
| - regexp.push("."); |
| + let separator = "[^-_.%" + (justHostname ? "" : "A-Z") + "a-z0-9]"; |
| + if (i == 0) |
| + regexp.push("^https?://(.*" + separator + ")?"); |
| + else if (i == lastIndex) |
| + regexp.push("(" + separator + ".*)?$"); |
| + else |
| + regexp.push(separator); |
| break; |
| case "|": |
| if (i == 0) |
| { |
| regexp.push("^"); |
| break; |
| } |
| if (i == lastIndex) |
« no previous file with comments
|
« no previous file
|
test/abp2blocklist.js » ('j')
|
no next file with comments »
