From 9331d5bbca168bebbb18c4c34222bee3cbaa3a24 Mon Sep 17 00:00:00 2001 From: ReznoRMichael Date: Wed, 26 Aug 2020 01:18:14 +0200 Subject: [PATCH] moved HKReadTextArea --- HKCheckCompletion.js | 13 +++++++++++++ index.html | 5 +++-- loadJson.js | 19 ++----------------- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/HKCheckCompletion.js b/HKCheckCompletion.js index 0e17f51..e3dbb90 100644 --- a/HKCheckCompletion.js +++ b/HKCheckCompletion.js @@ -373,4 +373,17 @@ function checkWarriorDreams(divId, dataObject, playerData) { fillHTML(divId, dataObject[i]); delete dataObject[i]; } +} + +function HKReadTextArea() { + cleanHTML(DIV_ID); + + let textAreaId = "save-area"; + let contents = document.getElementById(textAreaId).value; + + if(contents.length > 0) { + let jsonObj = JSON.parse(contents); + HKCheckCompletion(jsonObj); + // console.log(jsonObj); + } } \ No newline at end of file diff --git a/index.html b/index.html index 583d32a..e08feac 100644 --- a/index.html +++ b/index.html @@ -40,6 +40,7 @@ - Single Mask Shards locations - Single Vessel Fragments locations - Single Pale Ore locations? + - Deep clone Spells object -->
@@ -60,9 +61,9 @@
-
+
diff --git a/loadJson.js b/loadJson.js index a70d967..9481967 100644 --- a/loadJson.js +++ b/loadJson.js @@ -5,7 +5,6 @@ var jsonObj = ""; * @param callback Asynchronous function. */ function loadJSON(callback) { - jsonObj = ""; // new Http request object (asynchronous), both the web page and the XML file it tries to load, must be located on the same server. var xobj = new XMLHttpRequest(); @@ -37,21 +36,7 @@ loadJSON( function JSONparse(response) { // Parse JSON string into object jsonObj = JSON.parse(response); + document.getElementById("save-area").value = response; // console.log(jsonObj); } -); - -function HKReadTextArea() { - jsonObj = ""; - - cleanHTML(DIV_ID); - - let textAreaId = "save-area"; - let contents = document.getElementById(textAreaId).value; - - if(contents.length > 0) { - jsonObj = JSON.parse(contents); - HKCheckCompletion(jsonObj); - // console.log(jsonObj); - } -} \ No newline at end of file +); \ No newline at end of file