From 21f57e876713307b5e4d6dea588477ab4d3aa0cc Mon Sep 17 00:00:00 2001 From: Masahiko AMANO Date: Thu, 2 Feb 2023 22:59:32 +0300 Subject: [PATCH] fix(web): fix localStorage management --- web/public/js/tfm-management.js | 34 +++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/web/public/js/tfm-management.js b/web/public/js/tfm-management.js index a38cc16..aa965e1 100644 --- a/web/public/js/tfm-management.js +++ b/web/public/js/tfm-management.js @@ -1,9 +1,23 @@ -var sasahyou = JSON.parse(localStorage["sasahyou"]), - sappyou = JSON.parse(localStorage["sappyou"]), +var sasahyou = null, sappyou = null, shoppyou = null; +if (localStorage["sasahyou"] != null) { + sasahyou = JSON.parse(localStorage["sasahyou"]); +} +if (localStorage["sappyou"] != null) { + sappyou = JSON.parse(localStorage["sappyou"]); +} +if (localStorage["shoppyou"] != null) { shoppyou = JSON.parse(localStorage["shoppyou"]); -var sasahyou_mts = parseInt(localStorage["sasahyou_mts"]), - sappyou_mts = parseInt(localStorage["sappyou_mts"]), +} +var sasahyou_mts = 0, sappyou_mts = 0, shoppyou_mts = 0; +if (localStorage["sasahyou_mts"] != null) { + sasahyou_mts = parseInt(localStorage["sasahyou_mts"]); +} +if (localStorage["sappyou_mts"] != null) { + sappyou_mts = parseInt(localStorage["sappyou_mts"]); +} +if (localStorage["shoppyou_mts"] != null) { shoppyou_mts = parseInt(localStorage["shoppyou_mts"]); +} var current_sasa = null, current_tanzaku = null; function sasahyou_load() { @@ -12,14 +26,14 @@ function sasahyou_load() { alert("Failed to fetch TFM database"); throw new Error("Failed to fetch TFM database"); } - if (sasahyou == null || sasahyou_mts !== db_info.data[0].sasahyou_mts) { + if (sasahyou == null || sasahyou_mts !== db_info.data[0].sasahyou.mts) { let resp = tdb_query("$TFM", 16, ""); if (resp == null || !resp.status) { alert("Failed to get sasahyou"); throw new Error("Failed to get sasahyou"); } sasahyou = resp.data; - sasahyou_mts = db_info.data[0].sasahyou_mts; + sasahyou_mts = db_info.data[0].sasahyou.mts; localStorage["sasahyou"] = JSON.stringify(sasahyou); localStorage["sasahyou_mts"] = sasahyou_mts; } @@ -31,14 +45,14 @@ function sappyou_load() { alert("Failed to fetch TFM database"); throw new Error("Failed to fetch TFM database"); } - if (sappyou == null || sappyou_mts !== db_info.data[0].sappyou_mts) { + if (sappyou == null || sappyou_mts !== db_info.data[0].sappyou.mts) { let resp = tdb_query("$TFM", 32, ""); if (resp == null || !resp.status) { alert("Failed to get sappyou"); throw new Error("Failed to get sappyou"); } sappyou = resp.data; - sappyou_mts = db_info.data[0].sappyou_mts; + sappyou_mts = db_info.data[0].sappyou.mts; localStorage["sappyou"] = JSON.stringify(sappyou); localStorage["sappyou_mts"] = sappyou_mts; } @@ -50,14 +64,14 @@ function shoppyou_load() { alert("Failed to fetch TFM database"); throw new Error("Failed to fetch TFM database"); } - if (shoppyou == null || shoppyou_mts !== db_info.data[0].shoppyou_mts) { + if (shoppyou == null || shoppyou_mts !== db_info.data[0].shoppyou.mts) { let resp = tdb_query("$TFM", 8, ""); if (resp == null || !resp.status) { alert("Failed to get shoppyou"); throw new Error("Failed to get shoppyou"); } shoppyou = resp.data; - shoppyou_mts = db_info.data[0].shoppyou_mts; + shoppyou_mts = db_info.data[0].shoppyou.mts; localStorage["shoppyou"] = JSON.stringify(shoppyou); localStorage["shoppyou_mts"] = shoppyou_mts; }