diff --git a/index.html b/index.html
index 27dda36..ee56b30 100644
--- a/index.html
+++ b/index.html
@@ -49,11 +49,10 @@
选择服务器
loginButton.addEventListener("click", () => {
loginButton.setAttribute("loading", "")
loginDialog.setAttribute("disabled", "")
- // loginDialog.open = false
let host = localStorage.getItem("server");
let encrypted = localStorage.getItem("encrypted")
let protocol;
- if (encrypted.value === "true") {
+ if (encrypted === "true") {
protocol = "https://"
} else {
protocol = "http://"
@@ -71,6 +70,7 @@ 选择服务器
let json = JSON.parse(httpRequest.responseText);
let token = json.data.token;
sessionStorage.setItem("token", token);
+ loginDialog.open = false; // close dialog
window.location.reload();
} else {
loginButton.removeAttribute("loading")
@@ -89,13 +89,14 @@ 选择服务器
let host = localStorage.getItem("server");
let encrypted = localStorage.getItem("encrypted")
let protocol;
- if (encrypted.value === "true") {
+ if (encrypted === "true") {
protocol = "https://"
} else {
protocol = "http://"
}
- fetch(protocol + host).catch(() => {
+ fetch(protocol + host).catch((reason) => {
localStorage.clear(); // remove everything
+ console.error(reason)
window.location.reload();
});
let token = sessionStorage.getItem("token");
@@ -103,7 +104,7 @@ 选择服务器
console.log("Call login");
loginDialog.open = true;
} else {
- processMessenger(token, encrypted.value === "true", host)
+ processMessenger(token, encrypted === "true", host)
}
}
@@ -122,7 +123,7 @@ 选择服务器
} catch (e) {
localStorage.clear();
sessionStorage.clear();
- window.location.reload();
+ // window.location.reload();
}
}
diff --git a/select-server.html b/select-server.html
index a77528d..034745a 100644
--- a/select-server.html
+++ b/select-server.html
@@ -20,8 +20,11 @@
protocol = "http://"
}
fetch(protocol + value).then(() => {
+ localStorage.clear();
+ sessionStorage.clear();
localStorage.setItem("server", value);
localStorage.setItem("encrypted", encrypted.selected.toString());
+ console.log("OK");
window.open("index.html", "_self");
}).catch(() => {
dialog.open = true