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

this fixes https://github.com/chrisaljoudi/uBlock/issues/675

This commit is contained in:
gorhill 2015-06-07 20:27:19 -04:00
parent 8e55cdc4b8
commit 90d009ea3f
5 changed files with 91 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/checksums.txt
View File

@ -2,7 +2,7 @@
b8fd6f6a836d34e0629dca07424d7bd8 assets/ublock/privacy.txt
841bde1d6f0e702554d2d858da55603f assets/ublock/filters.txt
c9c5cc56bec563bc1885847f925b9be2 assets/ublock/mirror-candidates.txt
335f1ac551bc8fb11175c98133ffc8ff assets/ublock/filter-lists.json
dbd521983ed6a78956c11a91b0950352 assets/ublock/filter-lists.json
94c0a3eab74c42783855f07b22a429cf assets/thirdparties/home.fredfiber.no/langsholt/adblock.txt
fc30b0ab9c531f8f95a288d165f01634 assets/thirdparties/www.zoso.ro/pages/rolist.txt
72373316d0e7ad22604d307c2d93e7cc assets/thirdparties/adblock.gardar.net/is.abp.txt

114
assets/ublock/filter-lists.json
View File

@ -19,77 +19,90 @@
"off": true,
"title": "RUS: RU AdList (Дополнительная региональная подписка)",
"group": "regions",
"homeURL": "https://easylist-downloads.adblockplus.org/advblock.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/advblock.txt",
"supportURL": "https://forums.lanik.us/viewforum.php?f=102"
},
"easylist-downloads.adblockplus.org/bitblock.txt": {
"off": true,
"title": "RUS: BitBlock List (Дополнительная подписка фильтров)",
"group": "regions",
"homeURL": "https://easylist-downloads.adblockplus.org/bitblock.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/bitblock.txt",
"supportURL": "https://forums.lanik.us/viewforum.php?f=102"
},
"easylist-downloads.adblockplus.org/easylist.txt": {
"title": "EasyList",
"group": "ads",
"homeURL": "https://easylist-downloads.adblockplus.org/easylist.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/easylist.txt",
"supportURL": "https://forums.lanik.us/"
},
"easylist-downloads.adblockplus.org/easylist_noelemhide.txt": {
"off": true,
"title": "EasyList without element hiding rules",
"group": "ads",
"homeURL": "https://easylist-downloads.adblockplus.org/easylist_noelemhide.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/easylist_noelemhide.txt",
"supportURL": "https://forums.lanik.us/"
},
"easylist-downloads.adblockplus.org/easylistchina.txt": {
"off": true,
"title": "CHN: EasyList China (中文)",
"group": "regions",
"homeURL": "https://easylist-downloads.adblockplus.org/easylistchina.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/easylistchina.txt",
"supportURL": "http://abpchina.org/forum/forum.php"
},
"easylist-downloads.adblockplus.org/easylistdutch.txt": {
"off": true,
"title": "NLD: EasyList Dutch",
"group": "regions",
"homeURL": "https://easylist-downloads.adblockplus.org/easylistdutch.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/easylistdutch.txt",
"supportURL": "https://forums.lanik.us/viewforum.php?f=100"
},
"easylist-downloads.adblockplus.org/easylistgermany.txt": {
"off": true,
"title": "DEU: EasyList Germany",
"group": "regions",
"homeURL": "https://easylist-downloads.adblockplus.org/easylistgermany.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/easylistgermany.txt",
"supportURL": "https://forums.lanik.us/viewforum.php?f=90"
},
"easylist-downloads.adblockplus.org/easylistitaly.txt": {
"off": true,
"title": "ITA: EasyList Italy",
"group": "regions",
"homeURL": "https://easylist-downloads.adblockplus.org/easylistitaly.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/easylistitaly.txt",
"supportURL": "https://forums.lanik.us/viewforum.php?f=96"
},
"easylist-downloads.adblockplus.org/easyprivacy.txt": {
"title": "EasyPrivacy",
"group": "privacy",
"homeURL": "https://easylist-downloads.adblockplus.org/easyprivacy.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/easyprivacy.txt",
"supportURL": "https://forums.lanik.us/"
},
"easylist-downloads.adblockplus.org/fanboy-annoyance.txt": {
"off": true,
"title": "Fanboy’s Annoyance List",
"group": "social",
"homeURL": "https://easylist-downloads.adblockplus.org/fanboy-annoyance.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/fanboy-annoyance.txt",
"supportURL": "https://forums.lanik.us/"
},
"easylist-downloads.adblockplus.org/fanboy-social.txt": {
"off": true,
"title": "Fanboy’s Social Blocking List",
"group": "social",
"homeURL": "https://easylist-downloads.adblockplus.org/fanboy-social.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/fanboy-social.txt",
"supportURL": "https://forums.lanik.us/"
},
"easylist-downloads.adblockplus.org/liste_fr.txt": {
"off": true,
"title": "FRA: EasyList Liste FR",
"group": "regions",
"homeURL": "https://easylist-downloads.adblockplus.org/liste_fr.txt"
"homeURL": "https://easylist-downloads.adblockplus.org/liste_fr.txt",
"supportURL": "https://forums.lanik.us/viewforum.php?f=91"
},
"gitorious.org/adblock-latvian/adblock-latvian/raw/master_lists/latvian-list.txt": {
"off": true,
"title": "LVA: Latvian List",
"group": "regions",
"homeURL": "https://notabug.org/latvian-list/adblock-latvian/raw/master/lists/latvian-list.txt"
"homeURL": "https://notabug.org/latvian-list/adblock-latvian/raw/master/lists/latvian-list.txt",
"supportURL": "https://notabug.org/latvian-list/adblock-latvian"
},
"home.fredfiber.no/langsholt/adblock.txt": {
"off": true,
@ -101,7 +114,8 @@
"off": true,
"title": "hpHosts’ Ad and tracking servers",
"group": "multipurpose",
"homeURL": "http://hosts-file.net/.%5Cad_servers.txt"
"homeURL": "http://hosts-file.net/.%5Cad_servers.txt",
"supportURL": "http://hosts-file.net/"
},
"http://abp.mozilla-hispano.org/nauscopio/filtros.txt": {
"off": true,
@ -114,7 +128,8 @@
"off": true,
"title": "EST: Eesti saitidele kohandatud filter",
"group": "regions",
"homeURL": ""
"homeURL": "",
"supportURL": "http://adblock.ee/"
},
"https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt": {
"off": true,
@ -144,7 +159,8 @@
"off": true,
"title": "Adblock Warning Removal List",
"group": "ads",
"homeURL": ""
"homeURL": "",
"supportURL": "https://forums.lanik.us/"
},
"https://iadb.azurewebsites.net/Finland_adb.txt": {
"off": true,
@ -158,26 +174,30 @@
"title": "IDN: ABPindo",
"group": "regions",
"homeURL": "",
"oldLocation": "indonesianadblockrules.googlecode.com/hg/subscriptions/abpindo.txt"
"oldLocation": "indonesianadblockrules.googlecode.com/hg/subscriptions/abpindo.txt",
"supportURL": "https://github.com/heradhis/indonesianadblockrules"
},
"https://raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abpjf.txt": {
"off": true,
"title": "JPN: ABP Japanese filters (日本用フィルタ)",
"group": "regions",
"homeURL": "",
"oldLocation": "raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt"
"oldLocation": "raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt",
"supportURL": "https://github.com/k2jp/abp-japanese-filters"
},
"https://raw.githubusercontent.com/liamja/Prebake/master/obtrusive.txt": {
"off": true,
"title": "EU: Prebake - Filter Obtrusive Cookie Notices",
"group": "regions",
"homeURL": ""
"homeURL": "",
"supportURL": "https://github.com/liamja/Prebake"
},
"liste-ar-adblock.googlecode.com/hg/Liste_AR.txt": {
"off": true,
"title": "ara: Liste AR",
"group": "regions",
"homeURL": "https://liste-ar-adblock.googlecode.com/hg/Liste_AR.txt"
"homeURL": "https://liste-ar-adblock.googlecode.com/hg/Liste_AR.txt",
"supportURL": "https://code.google.com/p/liste-ar-adblock/"
},
"margevicius.lt/easylistlithuania.txt": {
"off": true,
@ -189,108 +209,126 @@
"off": true,
"title": "Malware domains (long-lived)",
"group": "malware",
"homeURL": "http://malwaredomains.lehigh.edu/files/immortal_domains.txt"
"homeURL": "http://malwaredomains.lehigh.edu/files/immortal_domains.txt",
"supportURL": "http://www.malwaredomains.com/"
},
"mirror1.malwaredomains.com/files/justdomains": {
"title": "Malware domains",
"group": "malware",
"homeURL": "http://malwaredomains.lehigh.edu/files/justdomains"
"homeURL": "http://malwaredomains.lehigh.edu/files/justdomains",
"supportURL": "http://www.malwaredomains.com/"
},
"pgl.yoyo.org/as/serverlist": {
"title": "Peter Lowe’s Ad server list",
"group": "ads",
"homeURL": "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext"
"homeURL": "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext",
"supportURL": "http://pgl.yoyo.org/adservers/"
},
"raw.githubusercontent.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt": {
"off": true,
"title": "ISR: EasyList Hebrew",
"group": "regions",
"homeURL": "https://raw.githubusercontent.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt"
"homeURL": "https://raw.githubusercontent.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt",
"supportURL": "https://github.com/AdBlockPlusIsrael/EasyListHebrew"
},
"raw.githubusercontent.com/cjx82630/cjxlist/master/cjxlist.txt": {
"off": true,
"title": "CHN: China: cjxlist (main focus on Chinese sites)",
"group": "regions",
"homeURL": "https://raw.githubusercontent.com/cjx82630/cjxlist/master/cjxlist.txt",
"oldLocation": "cjxlist1.googlecode.com/svn/cjxlist.txt"
"oldLocation": "cjxlist1.googlecode.com/svn/cjxlist.txt",
"supportURL": "https://github.com/cjx82630/cjxlist"
},
"raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt": {
"off": true,
"title": "Anti-Adblock Killer | Reek",
"group": "ads",
"homeURL": "https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt"
"homeURL": "https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt",
"supportURL": "https://github.com/reek/anti-adblock-killer"
},
"raw.githubusercontent.com/szpeter80/hufilter/master/hufilter.txt": {
"off": true,
"title": "HUN: hufilter",
"group": "regions",
"homeURL": "https://raw.githubusercontent.com/szpeter80/hufilter/master/hufilter.txt"
"homeURL": "https://raw.githubusercontent.com/szpeter80/hufilter/master/hufilter.txt",
"supportURL": "https://github.com/szpeter80/hufilter"
},
"raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt": {
"off": true,
"title": "CZE, SVK: EasyList Czech and Slovak",
"group": "regions",
"homeURL": "https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt"
"homeURL": "https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt",
"supportURL": "https://github.com/tomasko126/easylistczechandslovak"
},
"someonewhocares.org/hosts/hosts": {
"off": true,
"title": "Dan Pollock’s hosts file",
"group": "multipurpose",
"homeURL": "http://someonewhocares.org/hosts/hosts"
"homeURL": "http://someonewhocares.org/hosts/hosts",
"supportURL": "http://someonewhocares.org/hosts/"
},
"spam404bl.com/spam404scamlist.txt": {
"off": true,
"title": "Spam404",
"group": "malware",
"homeURL": "https://spam404bl.com/spam404scamlist.txt"
"homeURL": "https://spam404bl.com/spam404scamlist.txt",
"supportURL": "http://www.spam404.com/"
},
"stanev.org/abp/adblock_bg.txt": {
"off": true,
"title": "BGR: Bulgarian Adblock list",
"group": "regions",
"homeURL": "http://stanev.org/abp/adblock_bg.txt"
"homeURL": "http://stanev.org/abp/adblock_bg.txt",
"supportURL": "http://stanev.org/abp/"
},
"winhelp2002.mvps.org/hosts.txt": {
"off": true,
"title": "MVPS HOSTS",
"group": "multipurpose",
"homeURL": "http://winhelp2002.mvps.org/hosts.txt"
"homeURL": "http://winhelp2002.mvps.org/hosts.txt",
"supportURL": "http://winhelp2002.mvps.org/"
},
"www.fanboy.co.nz/enhancedstats.txt": {
"off": true,
"title": "Fanboy’s Enhanced Tracking List",
"group": "privacy",
"homeURL": "https://www.fanboy.co.nz/enhancedstats.txt"
"homeURL": "https://www.fanboy.co.nz/enhancedstats.txt",
"supportURL": "https://forums.lanik.us/"
},
"www.fanboy.co.nz/fanboy-antifacebook.txt": {
"off": true,
"title": "Anti-ThirdpartySocial (see warning inside list)",
"group": "social",
"homeURL": "https://www.fanboy.co.nz/fanboy-antifacebook.txt"
"homeURL": "https://www.fanboy.co.nz/fanboy-antifacebook.txt",
"supportURL": "https://forums.lanik.us/"
},
"www.fanboy.co.nz/fanboy-korean.txt": {
"off": true,
"title": "KOR: Fanboy's Korean",
"group": "regions",
"homeURL": "https://www.fanboy.co.nz/fanboy-korean.txt"
"homeURL": "https://www.fanboy.co.nz/fanboy-korean.txt",
"supportURL": "https://forums.lanik.us/"
},
"www.fanboy.co.nz/fanboy-swedish.txt": {
"off": true,
"title": "SWE: Fanboy's Swedish",
"group": "regions",
"homeURL": "https://www.fanboy.co.nz/fanboy-swedish.txt"
"homeURL": "https://www.fanboy.co.nz/fanboy-swedish.txt",
"supportURL": "https://forums.lanik.us/"
},
"www.fanboy.co.nz/fanboy-ultimate.txt": {
"off": true,
"title": "Fanboy+Easylist-Merged Ultimate List",
"group": "multipurpose",
"homeURL": "https://www.fanboy.co.nz/r/fanboy-ultimate.txt"
"homeURL": "https://www.fanboy.co.nz/r/fanboy-ultimate.txt",
"supportURL": "https://forums.lanik.us/"
},
"www.fanboy.co.nz/fanboy-vietnam.txt": {
"off": true,
"title": "VIE: Fanboy's Vietnamese",
"group": "regions",
"homeURL": "https://www.fanboy.co.nz/fanboy-vietnam.txt"
"homeURL": "https://www.fanboy.co.nz/fanboy-vietnam.txt",
"supportURL": "https://forums.lanik.us/"
},
"www.malwaredomainlist.com/hostslist/hosts.txt": {
"title": "Malware Domain List",

11
src/js/3p-filters.js
View File

@ -90,7 +90,6 @@ var renderFilterLists = function() {
};
var liFromListEntry = function(listKey) {
var elem, text;
var entry = listDetails.available[listKey];
var li = listEntryTemplate.clone();
@ -98,21 +97,21 @@ var renderFilterLists = function() {
li.descendants('input').attr('checked', '');
}
elem = li.descendants('a:nth-of-type(1)');
var elem = li.descendants('a:nth-of-type(1)');
elem.attr('href', 'asset-viewer.html?url=' + encodeURI(listKey));
elem.attr('type', 'text/html');
elem.attr('data-listkey', listKey);
elem.text(listNameFromListKey(listKey) + '\u200E');
if ( entry.supportName ) {
elem = li.descendants('a:nth-of-type(2)');
if ( entry.homeDomain ) {
elem.attr('href', 'http://' + encodeURI(entry.homeHostname));
elem.text('(' + entry.homeDomain + ')');
elem.attr('href', entry.supportURL);
elem.text('(' + entry.supportName + ')');
elem.css('display', '');
}
elem = li.descendants('span:nth-of-type(1)');
text = listStatsTemplate
var text = listStatsTemplate
.replace('{{used}}', renderNumber(!entry.off && !isNaN(+entry.entryUsedCount) ? entry.entryUsedCount : 0))
.replace('{{total}}', !isNaN(+entry.entryCount) ? renderNumber(entry.entryCount) : '?');
elem.text(text);

1
src/js/assets.js
View File

@ -1076,6 +1076,7 @@ exports.metadata = function(callback) {
entryOut.localChecksum = entryRepo.localChecksum;
entryOut.repoChecksum = entryRepo.repoChecksum;
entryOut.homeURL = homeURLs[path] || '';
entryOut.supportURL = entryRepo.supportURL || '';
entryOut.repoObsolete = entryOut.localChecksum !== entryOut.repoChecksum;
}
checkCacheObsolescence();

11
src/js/messaging.js
View File

@ -663,15 +663,18 @@ var µb = µBlock;
var prepEntries = function(entries) {
var µburi = µb.URI;
var entry;
var entry, hn;
for ( var k in entries ) {
if ( entries.hasOwnProperty(k) === false ) {
continue;
}
entry = entries[k];
if ( typeof entry.homeURL === 'string' ) {
entry.homeHostname = µburi.hostnameFromURI(entry.homeURL);
entry.homeDomain = µburi.domainFromHostname(entry.homeHostname);
if ( typeof entry.supportURL === 'string' && entry.supportURL !== '' ) {
entry.supportName = µburi.hostnameFromURI(entry.supportURL);
} else if ( typeof entry.homeURL === 'string' && entry.homeURL !== '' ) {
hn = µburi.hostnameFromURI(entry.homeURL);
entry.supportURL = 'http://' + hn + '/';
entry.supportName = µburi.domainFromHostname(hn);
}
}
};