prehistoric-systems/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2026-03-11 09:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

this will allow to add "tucows downloads"

Browse source
This commit is contained in:
gorhill 2015-07-11 17:40:42 -04:00
parent 1ac3d61427
commit abb89fd037
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/js/traffic.js
View file

@ -160,7 +160,7 @@ var onBeforeRootFrameRequest = function(details) {
pageDomain: requestDomain, pageDomain: requestDomain,
requestURL: requestURL, requestURL: requestURL,
requestHostname: requestHostname, requestHostname: requestHostname,
requestType: 'main_frame' requestType: 'other'
}; };
var result = ''; var result = '';
@ -179,20 +179,20 @@ var onBeforeRootFrameRequest = function(details) {
if ( result === '' ) { if ( result === '' ) {
result = isTemporarilyWhitelisted(result, requestHostname); result = isTemporarilyWhitelisted(result, requestHostname);
if ( result.charAt(1) === 'a' ) { if ( result.charAt(1) === 'a' ) {
result = 'ua:no-strict-blocking on(temporary)'; result = 'ua:no-strict-blocking true (temporary)';
} }
} }
// Filtering // Filtering
if ( result === '' ) { var snfe = µb.staticNetFilteringEngine;
if ( µb.staticNetFilteringEngine.matchString(context) !== undefined ) { if ( result === '' && snfe.matchString(context) !== undefined ) {
// We always need the long-form result here. // We always need the long-form result here.
result = µb.staticNetFilteringEngine.toResultString(true); result = snfe.toResultString(true);
// https://github.com/chrisaljoudi/uBlock/issues/1128 // https://github.com/chrisaljoudi/uBlock/issues/1128
// Do not block if the match begins after the hostname. // Do not block if the match begins after the hostname, except when
if ( result.charAt(1) === 'b' ) { // the filter is specifically of type `other`.
result = toBlockDocResult(requestURL, requestHostname, result); if ( result.charAt(1) === 'b' && (snfe.keyRegister & 0xF0) !== 0x80 ) {
} result = toBlockDocResult(requestURL, requestHostname, result);
} }
} }
@ -227,7 +227,7 @@ var onBeforeRootFrameRequest = function(details) {
hn: requestHostname, hn: requestHostname,
dn: requestDomain, dn: requestDomain,
fc: compiled, fc: compiled,
fs: µb.staticNetFilteringEngine.filterStringFromCompiled(compiled) fs: snfe.filterStringFromCompiled(compiled)
})); }));
vAPI.tabs.replace(tabId, vAPI.getURL('document-blocked.html?details=') + query); vAPI.tabs.replace(tabId, vAPI.getURL('document-blocked.html?details=') + query);