[Pkg-mozext-commits] [adblock-plus] 02/87: Issue 2668 - Use new subscription types in options page
David Prévot
taffit at moszumanska.debian.org
Sat Apr 30 17:59:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit a5c3363af1a9cb3f0d4b0d06d5b4e173a0dccf4b
Author: Thomas Greiner <thomas at adblockplus.org>
Date: Wed Nov 11 13:38:38 2015 +0100
Issue 2668 - Use new subscription types in options page
---
ext/common.js | 6 ++-
locale/en-US/common.json | 18 +++++++++
options.js | 16 ++++----
subscriptions.xml | 99 +++++++++++++++++++++++++++---------------------
4 files changed, 84 insertions(+), 55 deletions(-)
diff --git a/ext/common.js b/ext/common.js
index 779af2f..582168c 100644
--- a/ext/common.js
+++ b/ext/common.js
@@ -141,7 +141,7 @@
return [text, placeholders];
};
- var readCatalog = function(locale)
+ var readCatalog = function(locale, catalogFile)
{
var xhr = new XMLHttpRequest();
xhr.open("GET", "locale/" + locale + "/" + catalogFile, false);
@@ -190,7 +190,9 @@
if (locales.length == 0)
return "";
- readCatalog(locales.shift());
+ var locale = locales.shift();
+ readCatalog(locale, "common.json");
+ readCatalog(locale, catalogFile);
}
}
};
diff --git a/locale/en-US/common.json b/locale/en-US/common.json
new file mode 100644
index 0000000..f144db1
--- /dev/null
+++ b/locale/en-US/common.json
@@ -0,0 +1,18 @@
+{
+ "common_feature_anti_adblock_title": {
+ "description": "Feature title for anti-adblock blocking filter list",
+ "message": "Hide Adblock Warning Messages"
+ },
+ "common_feature_malware_title": {
+ "description": "Feature title for anti-malware filter list",
+ "message": "Block Malware"
+ },
+ "common_feature_privacy_title": {
+ "description": "Feature title for privacy filter list",
+ "message": "Disable Tracking"
+ },
+ "common_feature_social_title": {
+ "description": "Feature title for social media blocking filter list",
+ "message": "Remove Social Media Buttons"
+ }
+}
diff --git a/options.js b/options.js
index 5c63a20..aba03c8 100644
--- a/options.js
+++ b/options.js
@@ -210,7 +210,7 @@
if (subscriptionUrl in recommendationsMap)
{
var recommendation = recommendationsMap[subscriptionUrl];
- if (recommendation.isAdsType)
+ if (recommendation.type == "ads")
{
if (subscription.disabled == false)
{
@@ -257,9 +257,9 @@
if (subscriptionUrl in recommendationsMap)
{
var recommendation = recommendationsMap[subscriptionUrl];
- if (recommendation.isPopular)
+ if (recommendation.type != "ads")
collection = collections.popular;
- else if (recommendation.isAdsType && subscription.disabled == false)
+ else if (subscription.disabled == false)
collection = collections.langs;
else
collection = collections.allLangs;
@@ -309,19 +309,17 @@
subscription.homepage = null;
subscription.lastSuccess = null;
var recommendation = Object.create(null);
- recommendation.isAdsType = false;
- recommendation.isPopular = false;
+ recommendation.type = element.getAttribute("type");
var prefix = element.getAttribute("prefixes");
if (prefix)
{
- var prefix = element.getAttribute("prefixes").replace(/,/g, "_");
+ prefix = prefix.replace(/\W/g, "_");
subscription.title = ext.i18n.getMessage("options_language_" + prefix);
- recommendation.isAdsType = true;
}
else
{
- subscription.title = element.getAttribute("specialization");
- recommendation.isPopular = true;
+ var type = recommendation.type.replace(/\W/g, "_");
+ subscription.title = ext.i18n.getMessage("common_feature_" + type + "_title");
}
recommendationsMap[subscription.url] = recommendation;
diff --git a/subscriptions.xml b/subscriptions.xml
index 68ea2a6..b691753 100644
--- a/subscriptions.xml
+++ b/subscriptions.xml
@@ -23,117 +23,128 @@
url="https://easylist-downloads.adblockplus.org/easylist.txt"
homepage="https://easylist.adblockplus.org/"
prefixes="en"
- author="fanboy, MonztA, Famlam, Khrin"/>
+ author="fanboy, MonztA, Famlam, Khrin"
+ type="ads"/>
<subscription title="ABPindo+EasyList"
specialization="Bahasa Indonesia"
url="https://easylist-downloads.adblockplus.org/abpindo+easylist.txt"
homepage="http://abpindo.blogspot.com/"
prefixes="id"
- author="heradhis"/>
+ author="heradhis"
+ type="ads"/>
<subscription title="Bulgarian list+EasyList"
specialization="български"
url="https://easylist-downloads.adblockplus.org/bulgarian_list+easylist.txt"
homepage="http://stanev.org/abp/"
prefixes="bg"
- author="Александър Станев"/>
+ author="Александър Станев"
+ type="ads"/>
<subscription title="EasyList China+EasyList"
specialization="中文"
url="https://easylist-downloads.adblockplus.org/easylistchina+easylist.txt"
homepage="http://abpchina.org/forum/"
prefixes="zh"
- author="John, Li, Jiefei"/>
+ author="John, Li"
+ type="ads"/>
<subscription title="EasyList Czech and Slovak+EasyList"
specialization="čeština, slovenčina"
url="https://easylist-downloads.adblockplus.org/easylistczechslovak+easylist.txt"
homepage="http://adblock.sk/"
prefixes="cs,sk"
- author="tomasko126"/>
+ author="tomasko126"
+ type="ads"/>
<subscription title="EasyList Dutch+EasyList"
specialization="Nederlands"
url="https://easylist-downloads.adblockplus.org/easylistdutch+easylist.txt"
homepage="https://easylist.adblockplus.org/"
prefixes="nl"
- author="Famlam"/>
+ author="Famlam"
+ type="ads"/>
<subscription title="EasyList Germany+EasyList"
specialization="Deutsch"
url="https://easylist-downloads.adblockplus.org/easylistgermany+easylist.txt"
homepage="https://easylist.adblockplus.org/"
prefixes="de"
- author="MonztA, Famlam"/>
+ author="MonztA, Famlam"
+ type="ads"/>
<subscription title="EasyList Hebrew+EasyList"
specialization="עברית"
url="https://easylist-downloads.adblockplus.org/israellist+easylist.txt"
homepage="https://github.com/AdBlockPlusIsrael/EasyListHebrew"
prefixes="he"
- author="BsT"/>
+ author="BsT"
+ type="ads"/>
<subscription title="EasyList Italy+EasyList"
specialization="italiano"
url="https://easylist-downloads.adblockplus.org/easylistitaly+easylist.txt"
homepage="https://easylist.adblockplus.org/"
prefixes="it"
- author="Khrin"/>
+ author="Khrin"
+ type="ads"/>
<subscription title="EasyList Lithuania+EasyList"
specialization="lietuvių kalba"
url="https://easylist-downloads.adblockplus.org/easylistlithuania+easylist.txt"
homepage="http://margevicius.lt/"
prefixes="lt"
- author="Algimantas Margevičius"/>
+ author="Algimantas Margevičius"
+ type="ads"/>
<subscription title="Latvian List+EasyList"
specialization="latviešu valoda"
url="https://easylist-downloads.adblockplus.org/latvianlist+easylist.txt"
- homepage="http://latvian-list.site11.com/"
+ homepage="https://notabug.org/latvian-list/adblock-latvian"
prefixes="lv"
- author="anonymous74100"/>
+ author="anonymous74100"
+ type="ads"/>
<subscription title="Liste AR+Liste FR+EasyList"
specialization="العربية"
url="https://easylist-downloads.adblockplus.org/liste_ar+liste_fr+easylist.txt"
homepage="https://code.google.com/p/liste-ar-adblock/"
prefixes="ar"
- author="smed79"/>
+ author="smed79"
+ type="ads"/>
<subscription title="Liste FR+EasyList"
specialization="français"
url="https://easylist-downloads.adblockplus.org/liste_fr+easylist.txt"
homepage="http://adblock-listefr.com/"
prefixes="fr"
- author="Lian, Crits, smed79"/>
+ author="Lian, Crits, smed79"
+ type="ads"/>
<subscription title="ROList+EasyList"
specialization="românesc"
url="https://easylist-downloads.adblockplus.org/rolist+easylist.txt"
homepage="http://www.zoso.ro/rolist"
prefixes="ro"
- author="MenetZ, Zoso"/>
+ author="MenetZ, Zoso"
+ type="ads"/>
<subscription title="RuAdList+EasyList"
specialization="русский, українська"
url="https://easylist-downloads.adblockplus.org/ruadlist+easylist.txt"
- homepage="https://code.google.com/p/ruadlist/"
+ homepage="https://forums.lanik.us/viewforum.php?f=102"
prefixes="ru,uk"
- author="Lain_13"/>
- <subscription title="EasyPrivacy"
- specialization="Disable Tracking"
- url="https://easylist-downloads.adblockplus.org/easyprivacy.txt"
- homepage="https://easylist.adblockplus.org/"/>
- <subscription title="malware"
- specialization="Disable Malware Websites"
+ author="Lain_13"
+ type="ads"/>
+ <subscription title="Adblock Warning Removal List"
+ specialization="removes anti-adblock warnings and other obtrusive messages"
+ url="https://easylist-downloads.adblockplus.org/antiadblockfilters.txt"
+ homepage="https://easylist.adblockplus.org/"
+ author="authors of recommended filter lists"
+ type="anti-adblock"/>
+ <subscription title="Malware Domains"
+ specialization="malware protection"
url="https://easylist-downloads.adblockplus.org/malwaredomains_full.txt"
- homepage="http://malwaredomains.com/?page_id=2"/>
- <subscription title="fanboy"
- specialization="Disable Social media buttons"
+ homepage="http://malwaredomains.com/"
+ author="None"
+ type="malware"/>
+ <subscription title="EasyPrivacy+EasyList"
+ specialization="privacy protection"
+ url="https://easylist-downloads.adblockplus.org/easyprivacy+easylist.txt"
+ homepage="https://easylist.adblockplus.org/"
+ author="fanboy, MonztA, Famlam, Khrin"
+ type="privacy"/>
+ <subscription title="Fanboy's Social Blocking List"
+ specialization="removes social media integration"
url="https://easylist-downloads.adblockplus.org/fanboy-social.txt"
- homepage="https://easylist.adblockplus.org/"/>
- <subscription title="facebook annoyances blocker"
- specialization="Facebook annoyance"
- url="https://easylist-downloads.adblockplus.org/fb_annoyances_full.txt"
- homepage="http://facebook.adblockplus.me/"/>
- <subscription title="Pure Video Experience"
- specialization="Youtube annoyance"
- url="https://easylist-downloads.adblockplus.org/yt_annoyances_full.txt"
- homepage="http://youtube.adblockplus.me/"/>
- <subscription title="Prebake - Filter Obtrusive Cookie Notices"
- specialization="Prebake"
- url="https://raw.githubusercontent.com/liamja/Prebake/master/obtrusive.txt"
- homepage="http://liamja.github.io/Prebake/"/>
- <subscription title="Spam404"
- specialization="Spam404"
- url="https://spam404bl.com/spam404scamlist.txt"
- homepage="http://www.spam404.com/"/>
-</subscriptions>
+ homepage="https://easylist.adblockplus.org/"
+ author="fanboy, Famlam, MonztA"
+ type="social"/>
+ </subscriptions>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list