[Pkg-mozext-commits] [adblock-plus] 06/87: Issue 3515 - Use fetch() API instead (synchronous) XMLHttpRequest
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 f45f0d85482991bf99ece397d925a9c248d6a3a1
Author: Sebastian Noack <sebastian at adblockplus.org>
Date: Thu Jan 14 18:15:51 2016 +0100
Issue 3515 - Use fetch() API instead (synchronous) XMLHttpRequest
---
options.js | 68 ++++++++++++++++++++++++++++++++------------------------------
1 file changed, 35 insertions(+), 33 deletions(-)
diff --git a/options.js b/options.js
index 08e346b..2936490 100644
--- a/options.js
+++ b/options.js
@@ -312,42 +312,44 @@
function loadRecommendations()
{
- var request = new XMLHttpRequest();
- request.open("GET", "subscriptions.xml", false);
- request.addEventListener("load", function()
- {
- var list = document.getElementById("subscriptionSelector");
- var docElem = request.responseXML.documentElement;
- var elements = docElem.getElementsByTagName("subscription");
- for (var i = 0; i < elements.length; i++)
+ fetch("subscriptions.xml")
+ .then(function(response)
{
- var element = elements[i];
- var subscription = Object.create(null);
- subscription.title = element.getAttribute("title");
- subscription.url = element.getAttribute("url");
- subscription.disabled = null;
- subscription.downloadStatus = null;
- subscription.homepage = null;
- subscription.lastSuccess = null;
- var recommendation = Object.create(null);
- recommendation.type = element.getAttribute("type");
- var prefix = element.getAttribute("prefixes");
- if (prefix)
- {
- prefix = prefix.replace(/\W/g, "_");
- subscription.title = ext.i18n.getMessage("options_language_" + prefix);
- }
- else
+ return response.text();
+ })
+ .then(function(text)
+ {
+ var list = document.getElementById("subscriptionSelector");
+ var doc = new DOMParser().parseFromString(text, "application/xml");
+ var elements = doc.documentElement.getElementsByTagName("subscription");
+ for (var i = 0; i < elements.length; i++)
{
- var type = recommendation.type.replace(/\W/g, "_");
- subscription.title = ext.i18n.getMessage("common_feature_" + type + "_title");
- }
+ var element = elements[i];
+ var subscription = Object.create(null);
+ subscription.title = element.getAttribute("title");
+ subscription.url = element.getAttribute("url");
+ subscription.disabled = null;
+ subscription.downloadStatus = null;
+ subscription.homepage = null;
+ subscription.lastSuccess = null;
+ var recommendation = Object.create(null);
+ recommendation.type = element.getAttribute("type");
+ var prefix = element.getAttribute("prefixes");
+ if (prefix)
+ {
+ prefix = prefix.replace(/\W/g, "_");
+ subscription.title = ext.i18n.getMessage("options_language_" + prefix);
+ }
+ else
+ {
+ var type = recommendation.type.replace(/\W/g, "_");
+ subscription.title = ext.i18n.getMessage("common_feature_" + type + "_title");
+ }
- recommendationsMap[subscription.url] = recommendation;
- updateSubscription(subscription);
- }
- }, false);
- request.send(null);
+ recommendationsMap[subscription.url] = recommendation;
+ updateSubscription(subscription);
+ }
+ });
}
function onClick(e)
--
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