Skip to content
This repository was archived by the owner on Sep 9, 2022. It is now read-only.

Commit 58f897d

Browse files
uBlockAdminuBlockAdmin
committed
Merge branch 'v0.9.5.3'
* v0.9.5.3: - Removed donation request - Fixed issue of Rate Us link which was not working for Firefox
2 parents 025985a + 29aa9ba commit 58f897d

File tree

6 files changed

+7
-90
lines changed

6 files changed

+7
-90
lines changed

‎README.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
<a href="https://travis-ci.org/uBlock-LLC/uBlock">
1111
<img src="https://travis-ci.org/uBlock-LLC/uBlock.svg?branch=master" alt="Build status">
1212
</a>
13-
<a href="https://www.ublock.org/donate">
14-
<img src="https://raw.githubusercontent.com/uBlock-LLC/uBlock/master/doc/img/oncedonate.png" alt="Support development">
15-
</a>
1613
</td>
1714
</tr>
1815
<tr>
@@ -105,7 +102,7 @@ Being lean and efficient doesn't mean blocking less<br>
105102

106103
Some users might want to check out [uBlock Origin](https://github.com/gorhill/uBlock): a noteworthy personal fork of uBlock from @gorhill with a slightly different featureset.
107104

108-
uBlock is a general-purpose content blocker, which means it can be used to block ads as well as other forms of content on webpages. uBlock can also be used to help users neutralize privacy-invading trackers. uBlock blocks ads through its support of the [Adblock Plus filter syntax](https://adblockplus.org/en/filters). uBlock [extends](https://github.com/uBlock-LLC/uBlock/wiki/Filter-syntax-extensions) the syntax and is designed to work with custom rules and filters. If uBlock is useful to you, [donations to support development are much appreciated](https://www.ublock.org/donate/).
105+
uBlock is a general-purpose content blocker, which means it can be used to block ads as well as other forms of content on webpages. uBlock can also be used to help users neutralize privacy-invading trackers. uBlock blocks ads through its support of the [Adblock Plus filter syntax](https://adblockplus.org/en/filters). uBlock [extends](https://github.com/uBlock-LLC/uBlock/wiki/Filter-syntax-extensions) the syntax and is designed to work with custom rules and filters.
109106

110107
** Please note [recent news](https://www.ublock.org/announcement/) about the status of the uBlock project as of June 22, 2018.**
111108

‎platform/chromium/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 2,
33

44
"name": "__MSG_extName__",
5-
"version": "0.9.5.24",
5+
"version": "0.9.5.25",
66

77
"default_locale": "en",
88
"description": "__MSG_extShortDesc__",

‎src/js/background.js

-2
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@ return {
105105
// as per list headers.
106106
updateAssetsEvery: 97 * oneHour,
107107
projectServerRoot: 'https://raw.githubusercontent.com/uBlock-LLC/uBlock/master/',
108-
donationUrl: 'https://www.ublock.org/donate/',
109108
pslPath: 'assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat',
110-
111109
// permanent lists
112110
permanentLists: {
113111
// User

‎src/js/popup.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,10 @@ var getPopupData = function(tabId) {
742742
};
743743

744744
var redirectToReviewPage = function() {
745-
window.open("https://chrome.google.com/webstore/detail/ublock-free-ad-blocker/"+ location.host +"/reviews", "_blank");
745+
if(vAPI.browserInfo.flavor == "Chrome")
746+
window.open("https://chrome.google.com/webstore/detail/ublock-free-ad-blocker/"+ location.host +"/reviews", "_blank");
747+
else if(vAPI.browserInfo.flavor == "Firefox")
748+
window.open("https://addons.mozilla.org/en-US/firefox/addon/ublock/", "_blank");
746749
}
747750

748751
/******************************************************************************/

‎src/js/start.js

-5
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,6 @@ var onInstalled = function() {
211211
var onDataReceived = function(data) {
212212
entries = data.stats || {userId: µBlock.stats.generateUserId(),totalPings: 0 };
213213
vAPI.storage.set({ 'stats': entries });
214-
vAPI.tabs.open({
215-
url: µBlock.donationUrl+"?u=" + entries.userId + "&lg=" + navigator.language,
216-
select: true,
217-
index: -1
218-
});
219214
}
220215

221216
if(!firstInstall) {

‎src/js/storage.js

+1-77
Original file line numberDiff line numberDiff line change
@@ -205,71 +205,6 @@
205205
var availableLists = {};
206206
var relocationMap = {};
207207
var locationOfAA = 'acceptable-ads';
208-
let tempFLChangeMap = new Map([
209-
["adblock.gardar.net/is.abp.txt", "ISL"],
210-
["raw.githubusercontent.com/cjx82630/cjxlist/cjxlist.txt", "CHN-01"],
211-
["raw.githubusercontent.com/gioxx/filtri.txt", "ITA-01"],
212-
["easylist-downloads.adblockplus.org/advblock.txt", "RUS-01"],
213-
["easylist-downloads.adblockplus.org/bitblock.txt", "RUS-02"],
214-
["easylist-downloads.adblockplus.org/easylist.txt", "easylist"],
215-
["easylist-downloads.adblockplus.org/exceptionrules.txt", "acceptable-ads"],
216-
["raw.githubusercontent.com/abp-filters-anti-cv/english.txt", "abp-anti-circumvension"],
217-
["raw.githubusercontent.com/adblock-nocoin-list/nocoin.txt", "cryptocurrency"],
218-
["easylist-downloads.adblockplus.org/easylist_noelemhide.txt", "easylist-noelemhide"],
219-
["easylist-downloads.adblockplus.org/easylistchina.txt", "CHN-02"],
220-
["easylist-downloads.adblockplus.org/easylistdutch.txt", "NLD"],
221-
["easylist-downloads.adblockplus.org/easylistgermany.txt", "DEU"],
222-
["easylist-downloads.adblockplus.org/easylistitaly.txt", "ITA"],
223-
["easylist-downloads.adblockplus.org/easyprivacy.txt", "easyprivacy"],
224-
["easylist-downloads.adblockplus.org/fanboy-annoyance.txt", "fanboy-annoyance"],
225-
["easylist-downloads.adblockplus.org/fanboy-social.txt", "fanboy-social"],
226-
["easylist-downloads.adblockplus.org/liste_fr.txt", "FRA"],
227-
["adblock-latvian/latvian-list.txt", "LVA"],
228-
["raw.githubusercontent.com/DandelionSprout/adfilt/NorwegianList.txt", "NOR-DNK-ISL"],
229-
["hosts-file.net/ad-servers", "hpHosts"],
230-
["http://adblock.ee/list.php", "EST"],
231-
["https://easylist-downloads.adblockplus.org/antiadblockfilters.txt", "adblock-warning-rm"],
232-
["raw.githubusercontent.com/indonesianadblockrules/subscriptions/abpindo.txt", "IDN-MYS"],
233-
["gitcdn.xyz/adblock-iran/filter.txt", "IRN"],
234-
["easylist-downloads.adblockplus.org/Liste_AR.txt", "ARA"],
235-
["margevicius.lt/easylistlithuania.txt", "LTU"],
236-
["mirror1.malwaredomains.com/files/justdomains", "malware-01"],
237-
["pgl.yoyo.org/as/serverlist", "peter-lowe-ad"],
238-
["raw.githubusercontent.com/EasyListHebrew/master/EasyListHebrew.txt", "ISR"],
239-
["raw.githubusercontent.com/polish-adblock-filters/adblock.txt", "POL-01"],
240-
["raw.githubusercontent.com/polish-privacy-filters/anti-adblock.txt", "POL-02"],
241-
["raw.githubusercontent.com/k2jp/abp-japanese-filters/master/abp_jp.txt", "JPN"],
242-
["raw.githubusercontent.com/szpeter80/hufilter/master/hufilter.txt", "HUN"],
243-
["raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt", "CZE-SVK"],
244-
["raw.githubusercontent.com/finnish-easylist-addition/Finland_adb.txt", "FIN"],
245-
["someonewhocares.org/hosts/hosts", "dan-pollock"],
246-
["raw.githubusercontent.com/Spam404/lists/adblock-list.txt", "Spam404"],
247-
["stanev.org/abp/adblock_bg.txt", "BGR"],
248-
["winhelp2002.mvps.org/hosts.txt", "mvps"],
249-
["www.fanboy.co.nz/enhancedstats.txt", "fanboy-enhanced-tracking"],
250-
["www.fanboy.co.nz/fanboy-antifacebook.txt", "fanboy-antifacebook"],
251-
["raw.githubusercontent.com/adblock-korea-contrib/filter.txt", "KOR-01"],
252-
["raw.githubusercontent.com/YousList/youslist.txt", "KOR-02"],
253-
["raw.githubusercontent.com/Frellwits-filter-lists/Frellwits-Swedish-Filter.txt", "SWE"],
254-
["filters.adtidy.org/extension/ublock/filters/9.txt", "SPA-POR"],
255-
["raw.githubusercontent.com/easylist-thailand/easylist-thailand.txt", "THA"],
256-
["easylist-downloads.adblockplus.org/easylistspanish.txt", "SPA"],
257-
["www.fanboy.co.nz/fanboy-ultimate.txt", "fanboy-ultimate"],
258-
["raw.githubusercontent.com/abpvn/abpvn.txt", "VIE"],
259-
["www.malwaredomainlist.com/hostslist/hosts.txt", "malware-02"],
260-
["www.void.gr/kargig/void-gr-filters.txt", "GRC"],
261-
["raw.githubusercontent.com/ROad-Block/road-block-filters-light.txt", "ROU"],
262-
["filters.adtidy.org/extension/ublock/filters/2_without_easylist.txt", "adguard-base"],
263-
["filters.adtidy.org/extension/ublock/filters/3.txt", "adguard-spyware"],
264-
["filters.adtidy.org/extension/ublock/filters/14.txt", "adguard-annoyance"],
265-
["filters.adtidy.org/extension/ublock/filters/4.txt", "adguard-social"],
266-
["secure.fanboy.co.nz/fanboy-cookiemonster.txt", "fanboy-cookiemonster"],
267-
["s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt", "disconnect"],
268-
["filters.adtidy.org/extension/ublock/filters/7.txt", "JPN-01"],
269-
["filters.adtidy.org/extension/ublock/filters/1.txt", "RUS"],
270-
["filters.adtidy.org/extension/ublock/filters/13.txt", "TUR"]
271-
]);
272-
273208
// selected lists
274209
var onSelectedListsLoaded = function(store) {
275210
var µb = µBlock;
@@ -289,18 +224,7 @@
289224
off = lists[location].off === true;
290225
}
291226
}
292-
location = location.replace('assets/thirdparties/','');
293-
if(tempFLChangeMap.has(location)) {
294-
let tmpLocation = location;
295-
location = tempFLChangeMap.get(location);
296-
if(off === false) {
297-
if ( /^[a-z]+:\/\//.test(tmpLocation) ) {
298-
µb.purgeFilterList(tmpLocation);
299-
} else {
300-
µb.purgeFilterList('assets/thirdparties/' + tmpLocation);
301-
}
302-
}
303-
}
227+
304228
availableEntry = availableLists[location];
305229
if ( availableEntry === undefined ) {
306230
µb.purgeFilterList(location);

0 commit comments

Comments
 (0)