Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

this addresses #1056

This commit is contained in:
gorhill 2015-12-13 10:26:55 -05:00
parent 3c4a9b4e53
commit 720f76fb5a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/static-net-filtering.js
View File

@ -1303,6 +1303,7 @@ var trimChar = function(s, c) {
var FilterParser = function() { var FilterParser = function() {
this.reHasWildcard = /[\^\*]/; this.reHasWildcard = /[\^\*]/;
this.reCanTrimCarets = /^([^*]*|[^^]+\^[^^]+)$/;
this.reHasUppercase = /[A-Z]/; this.reHasUppercase = /[A-Z]/;
this.reCleanupHostname = /^\|\|[.*]*/; this.reCleanupHostname = /^\|\|[.*]*/;
this.reIsolateHostname = /^([^\x00-\x24\x26-\x2C\x2F\x3A-\x5E\x60\x7B-\x7F]+)(.*)/; this.reIsolateHostname = /^([^\x00-\x24\x26-\x2C\x2F\x3A-\x5E\x60\x7B-\x7F]+)(.*)/;
@ -1566,7 +1567,10 @@ FilterParser.prototype.parse = function(raw) {
if ( s.slice(-1) === '*' ) { if ( s.slice(-1) === '*' ) {
s = s.replace(/([^%0-9a-z])\*+$/, '$1'); s = s.replace(/([^%0-9a-z])\*+$/, '$1');
} }
s = trimChar(s, '^'); // https://github.com/gorhill/uBlock/issues/1056
if ( this.reCanTrimCarets.test(s) ) {
s = trimChar(s, '^');
}
} }
// nothing left? // nothing left?