diff --git a/js/interact.js b/js/interact.js
index 884ccda..59aa93b 100644
--- a/js/interact.js
+++ b/js/interact.js
@@ -110,19 +110,17 @@ function submissionError(data, ans) {
});
}
-// TODO: async request
export function getQuestion(url, question_number, question_total) {
- console.log("Downloading ", url, question_number, question_total);
+ console.log("Downloading question ", url, question_number, question_total);
return $.ajax({
dataType: "json",
url: url,
progress: function (e) {
- console.log(e);
if (e.lengthComputable) {
var completedPercentage = Math.round((e.loaded * 100) / e.total);
$("#progress").html(
- `Downloading [${question_number}/${question_total}]${completedPercentage}%
${helper.formatBytes(
+ `Downloading question [${question_number}/${question_total}]
${completedPercentage}%
${helper.formatBytes(
e.total
)}`
);
diff --git a/js/main.js b/js/main.js
index 6f94611..29d012b 100644
--- a/js/main.js
+++ b/js/main.js
@@ -465,21 +465,10 @@ function setUpPacket(data, path) {
//request_numbers.push(n)
data["questions"][n] = question_json;
}
+ // Once all questions have been downloaded we carry on loading
loadSession();
})()
-
- //(async () => {
- // for(let f of requests){
- // var json = await f;
- // console.log(json)
- //};
- //})()
-
- //$.when.apply($,requests).then(function(){
- // console.log(arguments); //array of responses [0][data, status, xhrObj],[1][data, status, xhrObj]...
- //})
-
} else {
// Just carry on loading
loadSession();