mirror of
https://github.com/gorhill/uBlock.git
synced 2024-11-05 18:32:30 +01:00
Fix #1212: less aggressive document blocking
This commit is contained in:
parent
09825e1165
commit
d92ea20acf
@ -256,13 +256,6 @@ var toBlockDocResult = function(url, hostname, result) {
|
||||
return '';
|
||||
}
|
||||
|
||||
// Quick test: if the result starts with `|` or `||`, then this means the
|
||||
// match is before the path part of the URL for sure.
|
||||
// Examples: sb:|http:// sb:||example.com^
|
||||
if ( result.charAt(3) === '|' ) {
|
||||
return result;
|
||||
}
|
||||
|
||||
// Make a regex out of the result
|
||||
var reText = result.slice(3);
|
||||
var pos = reText.indexOf('$');
|
||||
@ -270,11 +263,6 @@ var toBlockDocResult = function(url, hostname, result) {
|
||||
reText = reText.slice(0, pos);
|
||||
}
|
||||
|
||||
// Matches whole URL
|
||||
if ( reText === '*' ) {
|
||||
return result;
|
||||
}
|
||||
|
||||
// We are going to have to take the long way to find out
|
||||
if ( reText.charAt(0) === '/' && reText.slice(-1) === '/' ) {
|
||||
reText = reText.slice(1, -1);
|
||||
@ -295,8 +283,8 @@ var toBlockDocResult = function(url, hostname, result) {
|
||||
return '';
|
||||
}
|
||||
|
||||
// verify that the match starts before the path
|
||||
if ( matches.index < url.indexOf(hostname) + hostname.length ) {
|
||||
// make sure the match ends before the path-part of the URL (#1212)
|
||||
if ( re.lastIndex <= url.indexOf(hostname) + hostname.length + 1 ) {
|
||||
return result;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user