diff --git a/web/public/js/tdbms.js b/web/public/js/tdbms.js index 3ec334d..ffdb8b1 100644 --- a/web/public/js/tdbms.js +++ b/web/public/js/tdbms.js @@ -1,24 +1,29 @@ -var sasahyou = null, sappyou = null, shoppyou = null; +var db_name = null; +var sasahyou = localStorage["sasahyou"], + sappyou = localStorage["sappyou"], + shoppyou = localStorage["shoppyou"]; var sort_files = localStorage["sort_files"], sort_tags = localStorage["sort_tags"]; -if (localStorage["sasahyou"] != null) { - sasahyou = JSON.parse(localStorage["sasahyou"]); +if (sasahyou != null) { + sasahyou = JSON.parse(sasahyou); } -if (localStorage["sappyou"] != null) { - sappyou = JSON.parse(localStorage["sappyou"]); +if (sappyou != null) { + sappyou = JSON.parse(sappyou); } -if (localStorage["shoppyou"] != null) { - shoppyou = JSON.parse(localStorage["shoppyou"]); +if (shoppyou != null) { + shoppyou = JSON.parse(shoppyou); } -var sasahyou_mts = 0, sappyou_mts = 0, shoppyou_mts = 0; -if (localStorage["sasahyou_mts"] != null) { - sasahyou_mts = parseInt(localStorage["sasahyou_mts"]); +var sasahyou_mts = localStorage["sasahyou_mts"], + sappyou_mts = localStorage["sappyou_mts"], + shoppyou_mts = localStorage["shoppyou_mts"]; +if (sasahyou_mts != null) { + sasahyou_mts = parseInt(sasahyou_mts); } -if (localStorage["sappyou_mts"] != null) { - sappyou_mts = parseInt(localStorage["sappyou_mts"]); +if (sappyou_mts != null) { + sappyou_mts = parseInt(sappyou_mts); } -if (localStorage["shoppyou_mts"] != null) { - shoppyou_mts = parseInt(localStorage["shoppyou_mts"]); +if (shoppyou_mts != null) { + shoppyou_mts = parseInt(shoppyou_mts); } if (sort_files == null) { sort_files = "id"; @@ -52,14 +57,14 @@ function tdb_query(trdb, trc, trb) { return output; } -function sasahyou_load(tdb) { - let db_info = tdb_query(tdb, 0, ""); +function sasahyou_load() { + let db_info = tdb_query(db_name, 0, ""); if (db_info == null || !db_info.status) { alert("Failed to fetch database"); throw new Error("Failed to fetch database"); } if (sasahyou == null || sasahyou_mts !== db_info.data[0].sasahyou.mts) { - let resp = tdb_query(tdb, 16, ""); + let resp = tdb_query(db_name, 16, ""); if (resp == null || !resp.status) { alert("Failed to get sasahyou"); throw new Error("Failed to get sasahyou"); @@ -71,14 +76,14 @@ function sasahyou_load(tdb) { } } -function sappyou_load(tdb) { - let db_info = tdb_query(tdb, 0, ""); +function sappyou_load() { + let db_info = tdb_query(db_name, 0, ""); if (db_info == null || !db_info.status) { alert("Failed to fetch database"); throw new Error("Failed to fetch database"); } if (sappyou == null || sappyou_mts !== db_info.data[0].sappyou.mts) { - let resp = tdb_query(tdb, 32, ""); + let resp = tdb_query(db_name, 32, ""); if (resp == null || !resp.status) { alert("Failed to get sappyou"); throw new Error("Failed to get sappyou"); @@ -90,14 +95,14 @@ function sappyou_load(tdb) { } } -function shoppyou_load(tdb) { - let db_info = tdb_query(tdb, 0, ""); +function shoppyou_load() { + let db_info = tdb_query(db_name, 0, ""); if (db_info == null || !db_info.status) { alert("Failed to fetch database"); throw new Error("Failed to fetch database"); } if (shoppyou == null || shoppyou_mts !== db_info.data[0].shoppyou.mts) { - let resp = tdb_query(tdb, 8, ""); + let resp = tdb_query(db_name, 8, ""); if (resp == null || !resp.status) { alert("Failed to get shoppyou"); throw new Error("Failed to get shoppyou"); diff --git a/web/public/js/tfm-management.js b/web/public/js/tfm-management.js index 2719c6a..f3310b5 100644 --- a/web/public/js/tfm-management.js +++ b/web/public/js/tfm-management.js @@ -1,4 +1,4 @@ -var db_name = localStorage["tfm_db_name"]; +db_name = localStorage["tfm_db_name"]; if (db_name == null) { location.href = "/tfm/settings"; }