Fix newline error

JetSimon · May 2, 2023 · 028da2e · 028da2e
1 parent dec1d3c
commit 028da2e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/js/base.js b/js/base.js
@@ -154,6 +154,7 @@ function extractJSON(raw_file, start, end, backup = null, backupEnd = null, requ
     let f = raw_file
     if(!f.includes(start)) {
         if(backup != null) {
+            console.log(`ERROR: Start [${start}] not in file provided, trying backup`)
             return extractJSON(f, backup, backupEnd == null ? end : backupEnd, null, null, required)
         }
 
@@ -219,7 +220,8 @@ function loadDataFromFile(raw_json) {
 
     let jet_data = {}
 
-    raw_json = raw_json.replaceAll("\n", "")
+    raw_json = raw_json.replaceAll("\n", "");
+    raw_json = raw_json.replaceAll("\r", "")
     raw_json = raw_json.replaceAll(/ +/g, " ");
 
     states_json = extractJSON(raw_json, "campaignTrail_temp.states_json = JSON.parse(", ");", "campaignTrail_temp.states_json = [", "]")

diff --git a/js/components.js b/js/components.js
@@ -30,6 +30,11 @@ async function loadData() {
 }
 
 function getListOfCandidates() {
+
+    if(Object.values(Vue.prototype.$TCT.candidate_issue_score).length == 0) {
+        return [[null, null]];
+    }
+
     let arr = Object.values(Vue.prototype.$TCT.candidate_issue_score).map(c => c.fields.candidate);
     arr = Array.from(new Set(arr));
     arr = arr.map((c) => {