Bug 1008825 - Synchronous XMLHttpRequest to load options.xul. r=wesj

This commit is contained in:
Vikneshwar 2014-07-07 11:23:00 +02:00
Родитель 3cccd02b12
Коммит 8168b217e1
1 изменённых файлов: 28 добавлений и 25 удалений

Просмотреть файл

@ -330,8 +330,8 @@ var Addons = {
try { try {
let optionsURL = aListItem.getAttribute("optionsURL"); let optionsURL = aListItem.getAttribute("optionsURL");
let xhr = new XMLHttpRequest(); let xhr = new XMLHttpRequest();
xhr.open("GET", optionsURL, false); xhr.open("GET", optionsURL, true);
xhr.send(); xhr.onload = function(e) {
if (xhr.responseXML) { if (xhr.responseXML) {
// Only allow <setting> for now // Only allow <setting> for now
let settings = xhr.responseXML.querySelectorAll(":root > setting"); let settings = xhr.responseXML.querySelectorAll(":root > setting");
@ -339,8 +339,9 @@ var Addons = {
for (let i = 0; i < settings.length; i++) { for (let i = 0; i < settings.length; i++) {
var setting = settings[i]; var setting = settings[i];
var desc = stripTextNodes(setting).trim(); var desc = stripTextNodes(setting).trim();
if (!setting.hasAttribute("desc")) if (!setting.hasAttribute("desc")) {
setting.setAttribute("desc", desc); setting.setAttribute("desc", desc);
}
box.appendChild(setting); box.appendChild(setting);
} }
// Send an event so add-ons can prepopulate any non-preference based // Send an event so add-ons can prepopulate any non-preference based
@ -358,6 +359,8 @@ var Addons = {
aListItem.setAttribute("optionsURL", ""); aListItem.setAttribute("optionsURL", "");
} }
} }
}
xhr.send(null);
} catch (e) { } } catch (e) { }
let list = document.querySelector("#addons-list"); let list = document.querySelector("#addons-list");