diff --git a/index.html b/index.html index f8397e0..c572f9b 100644 --- a/index.html +++ b/index.html @@ -86,7 +86,7 @@ - + diff --git a/js/LoadJson.js b/js/LoadJson.js index 30fc9fb..7d00e84 100644 --- a/js/LoadJson.js +++ b/js/LoadJson.js @@ -2,25 +2,26 @@ var jsonObj = ""; // save file names list in the save/ folder var fileName = [ - "reznor0.json", // 0 - "reznor1beforegruz.json", // 1 - "reznor2aftergruz.json", // 2 - "reznor5hornet.json", // 3 - "reznor29ss.json", // 4 - "ext48.json", // 5 - "reznor88banish.json", // 6 - "reznor99whitefragment.json", // 7 - "reznor100.json", // 8 - "reznor103ss.json", // 9 - "reznor107.json", // 10 - "reznor112grimm.json", // 11 - "PoP/kanna.json", // 12 - "PoP/Reaper4578.json", // 13 - "PoP/tintingaroo.json", // 14 + "reznor0", // 0 + "reznor1beforegruz", // 1 + "reznor2aftergruz", // 2 + "reznor5hornet", // 3 + "reznor29ss", // 4 + "ext48", // 5 + "reznor88banish", // 6 + "reznor99whitefragment", // 7 + "reznor100", // 8 + "reznor103ss", // 9 + "reznor107", // 10 + "reznor112grimm", // 11 + "PoP/kanna", // 12 + "PoP/Reaper4578", // 13 + "PoP/tintingaroo", // 14 ]; /** * Reads the .json file and parses it to a JS object (jsonObj). + * @param {string} filename Path and .json file name to be loaded * @param callback Function to be called when the request completes */ function LoadJSON(filename, callback) { @@ -37,24 +38,36 @@ function LoadJSON(filename, callback) { psw: optional password */ xobj.open('GET', filename, true); // Path to the file + // Sends the request to the server - Used for GET requests + xobj.send(null); + // Defines a function to be called when the readyState property changes - xobj.onreadystatechange = function GetResponseText() { + /* xobj.onreadystatechange = function GetResponseText() { if (xobj.readyState == 4 && xobj.status == "200") { // Required use of an anonymous callback as .open will NOT return a value but simply returns undefined in asynchronous mode // Returns the response data as a string return callback(xobj.responseText); } else return false; - }; + }; */ // Sends the request to the server - Used for GET requests - xobj.send(null); + // xobj.send(null); + + xobj.onload = function JSONparse() { + // Parse JSON string into object + const jsonObject = JSON.parse(xobj.responseText); + document.getElementById("save-area").value = JSON.stringify(jsonObject); + return jsonObject; + // console.log(jsonObj); + } } -function JSONparse(response) { +/* function JSONparse(response) { // Parse JSON string into object let jsonObject = JSON.parse(response); document.getElementById("save-area").value = response; return jsonObject; // console.log(jsonObj); -} +} */ -jsonObj = LoadJSON("../save/" + fileName[13], JSONparse(response)); \ No newline at end of file +// jsonObj = LoadJSON("../save/" + fileName[5], JSONparse(response)); +jsonObj = LoadJSON("save/" + fileName[5] + ".json"); \ No newline at end of file