From 6a4de3f44ef79a3fc8a59f5e0473c361050c5a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20V=C3=A9ril?= Date: Mon, 9 Sep 2019 15:15:39 +0200 Subject: [PATCH] Add getTextFromFileAsync function --- content/scripts/data.js | 19 +------------------ content/scripts/getTextFromFile.js | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 content/scripts/getTextFromFile.js diff --git a/content/scripts/data.js b/content/scripts/data.js index 6d1231f7..7e9d5dd6 100644 --- a/content/scripts/data.js +++ b/content/scripts/data.js @@ -71,24 +71,7 @@ class data { this.excitations=[]; } static async loadAsync(file) { - return new Promise(function (resolve, reject) { - var req = new XMLHttpRequest(); - req.open("GET",getFullDataPath(file), true); - req.onreadystatechange = function() { - if (req.readyState == 4) { - if (req.status == 200) {//when a good response is given do this - var text = req.responseText; - resolve(data.loadString(text)); - } else { - reject({ - status: req.status, - statusText: req.statusText - }); - } - } - } - req.send(); - }); + return data.loadString(await getTextFromFileAsync(getFullDataPath(file))); } static loadString(text) { // for each line with metadata diff --git a/content/scripts/getTextFromFile.js b/content/scripts/getTextFromFile.js new file mode 100644 index 00000000..acc499ad --- /dev/null +++ b/content/scripts/getTextFromFile.js @@ -0,0 +1,20 @@ +async function getTextFromFileAsync(file) { + return new Promise(function (resolve, reject) { + var req = new XMLHttpRequest(); + req.open("GET",file, true); + req.onreadystatechange = function() { + if (req.readyState == 4) { + if (req.status == 200) {//when a good response is given do this + var text = req.responseText; + resolve(text); + } else { + reject({ + status: req.status, + statusText: req.statusText + }); + } + } + } + req.send(); + }); +} \ No newline at end of file