[Pkg-mozext-commits] [adblock-plus] 63/74: Issue 2677 - Reset subscriptions.xml to serve as mere test data
David Prévot
taffit at moszumanska.debian.org
Tue Aug 11 12:07:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit 974ed90a933cf0294acf02185f7f4944fda817ec
Author: Thomas Greiner <thomas at adblockplus.org>
Date: Thu Jul 30 11:33:01 2015 +0200
Issue 2677 - Reset subscriptions.xml to serve as mere test data
---
README.md | 2 ++
options.js | 4 ++--
subscriptions.xml | 26 +++++++-------------------
3 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/README.md b/README.md
index 2678aa5..106ae8e 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,8 @@ Directory structure
to messages sent by UI code.
* `background.html`, `background.js`: Test implementation of the background
page, should *not be imported*.
+ * `options.html`, `options.js`: Options page, see below
+ * `subscriptions.xml`: Test subscription data, should *not be imported*
* `locale` directory: Localized strings, with one directory per locale. The
Firefox format for locale identifiers is used (xx-YY where xx is the language
code and YY the optional region code). The localization strings themselves are
diff --git a/options.js b/options.js
index 2bc8e9e..2ab5133 100644
--- a/options.js
+++ b/options.js
@@ -319,10 +319,10 @@
recommendation.isAdsType = true;
}
else
+ {
subscription.title = element.getAttribute("specialization");
-
- if (element.getAttribute("popular"))
recommendation.isPopular = true;
+ }
recommendationsMap[subscription.url] = recommendation;
updateSubscription(subscription);
diff --git a/subscriptions.xml b/subscriptions.xml
index eff4c40..68ea2a6 100644
--- a/subscriptions.xml
+++ b/subscriptions.xml
@@ -17,11 +17,6 @@
- along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
-->
-<!--
- Bundling current file in adblockplusui repository is just a temprorary
- solution until #2677 is fixed
- -->
-
<subscriptions>
<subscription title="EasyList"
specialization="English"
@@ -116,36 +111,29 @@
<subscription title="EasyPrivacy"
specialization="Disable Tracking"
url="https://easylist-downloads.adblockplus.org/easyprivacy.txt"
- homepage="https://easylist.adblockplus.org/"
- popular="true"/>
+ homepage="https://easylist.adblockplus.org/"/>
<subscription title="malware"
specialization="Disable Malware Websites"
url="https://easylist-downloads.adblockplus.org/malwaredomains_full.txt"
- homepage="http://malwaredomains.com/?page_id=2"
- popular="true"/>
+ homepage="http://malwaredomains.com/?page_id=2"/>
<subscription title="fanboy"
specialization="Disable Social media buttons"
url="https://easylist-downloads.adblockplus.org/fanboy-social.txt"
- homepage="https://easylist.adblockplus.org/"
- popular="true"/>
+ 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/"
- popular="true"/>
+ 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/"
- popular="true"/>
+ 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/"
- popular="true"/>
+ homepage="http://liamja.github.io/Prebake/"/>
<subscription title="Spam404"
specialization="Spam404"
url="https://spam404bl.com/spam404scamlist.txt"
- homepage="http://www.spam404.com/"
- popular="true"/>
+ homepage="http://www.spam404.com/"/>
</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