Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-16 23:42:39 +01:00
Code Issues Releases Wiki Activity

this fixes https://github.com/gorhill/uBlock/issues/135 and #1329

Browse Source
This commit is contained in:
gorhill 2015-04-27 11:07:51 -04:00 committed by Chris
parent 128e7bf9ff
commit da9aaf73e1
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/background.js
View File

@ -71,9 +71,11 @@ return {
netWhitelist: {},
netWhitelistModifyTime: 0,
netWhitelistDefault: [
'about-scheme',
'behind-the-scene',
'chrome-extension-scheme',
'chrome-scheme',
'loopconversation.about-scheme',
'opera-scheme'
].join('\n').trim(),

10
src/js/start.js
View File

@ -81,6 +81,16 @@ var onVersionReady = function(lastVersion) {
);
µb.saveWhitelist();
}
// https://github.com/gorhill/uBlock/issues/135#issuecomment-96677379
// `about:loopconversation` is used by Firefox for its Hello service
if ( lastVersion.localeCompare('0.9.3.5') <= 0 ) {
µb.netWhitelist = µb.whitelistFromString(
µb.stringFromWhitelist(µb.netWhitelist) +
'\n' +
'loopconversation.about-scheme'
);
µb.saveWhitelist();
}
if ( lastVersion !== vAPI.app.version ) {
vAPI.storage.set({ version: vAPI.app.version });
}

8
src/js/tab.js
View File

@ -55,13 +55,15 @@ var µb = µBlock;
return uri.normalizedURI();
}
var url = 'http://' + scheme + '-scheme/';
var fakeHostname = scheme + '-scheme';
if ( uri.hostname !== '' ) {
url += uri.hostname + '/';
fakeHostname = uri.hostname + '.' + fakeHostname;
} else if ( scheme === 'about' && uri.path !== '' ) {
fakeHostname = uri.path + '.' + fakeHostname;
}
return url;
return 'http://' + fakeHostname + '/';
};
/******************************************************************************/