update

XiaoHeiPa · Jun 29, 2024 · b512c94 · b512c94
1 parent c0e6698
commit b512c94
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/index.html b/index.html
@@ -49,11 +49,10 @@ <h2>选择服务器</h2>
     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 @@ <h2>选择服务器</h2>
                 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,21 +89,22 @@ <h2>选择服务器</h2>
         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");
         if (token === null) {
             console.log("Call login");
             loginDialog.open = true;
         } else {
-            processMessenger(token, encrypted.value === "true", host)
+            processMessenger(token, encrypted === "true", host)
         }
     }
 
@@ -122,7 +123,7 @@ <h2>选择服务器</h2>
         } catch (e) {
             localStorage.clear();
             sessionStorage.clear();
-            window.location.reload();
+            // window.location.reload();
         }
     }
 </script>

diff --git 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