diff options
| -rw-r--r-- | webAO/index.html | 6 | ||||
| -rw-r--r-- | webAO/master.js | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/webAO/index.html b/webAO/index.html index dda9e0a..d3fc05f 100644 --- a/webAO/index.html +++ b/webAO/index.html @@ -19,11 +19,11 @@ <meta property="twitter:image" content="https://repository-images.githubusercontent.com/78860508/89fcba80-aafd-11e9-80db-c5b10c01aba9"> <meta http-equiv="Content-Security-Policy" - content="default-src 'self' 'unsafe-inline' 'unsafe-eval' *.aceattorneyonline.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; connect-src 'self' ws:;"> + content="default-src 'self' 'unsafe-inline' 'unsafe-eval' *.aceattorneyonline.com data:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; connect-src 'self' ws:;"> <meta http-equiv="X-Content-Security-Policy" - content="default-src 'self' 'unsafe-inline' 'unsafe-eval' *.aceattorneyonline.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; connect-src 'self' ws:;"> + content="default-src 'self' 'unsafe-inline' 'unsafe-eval' *.aceattorneyonline.com data:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; connect-src 'self' ws:;"> <meta http-equiv="X-WebKit-CSP" - content="default-src 'self' 'unsafe-inline' 'unsafe-eval' *.aceattorneyonline.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; connect-src 'self' ws:;"> + content="default-src 'self' 'unsafe-inline' 'unsafe-eval' *.aceattorneyonline.com data:; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; connect-src 'self' ws:;"> <meta name="viewport" content="width=700, initial-scale=1"> diff --git a/webAO/master.js b/webAO/master.js index 947889b..c1543f3 100644 --- a/webAO/master.js +++ b/webAO/master.js @@ -96,6 +96,7 @@ function onOpen(_e) { function onError(evt) { document.getElementById("ms_error").style.display = "block"; document.getElementById("ms_error_code").innerText = `A network error occurred: ${evt.reason} (${evt.code})`; + return; } function checkOnline(serverID, coIP) { @@ -124,11 +125,13 @@ function checkOnline(serverID, coIP) { if (coheader === "PN") { servers[serverID].online = `Online: ${Number(coarguments[0])}/${Number(coarguments[1])}`; oserv.close(); + return; } else if (coheader === "BD") { servers[serverID].online = "Banned"; servers[serverID].description = coarguments[0]; oserv.close(); + return; } if (serverID === selectedServer) document.getElementById("serverdescription_content").innerHTML = "<b>" + servers[serverID].online + "</b><br>" + safe_tags(servers[serverID].description); @@ -146,6 +149,7 @@ function checkOnline(serverID, coIP) { oserv.onerror = function (_evt) { console.warn(coIP + " threw an error."); document.getElementById(`server${serverID}`).className = "unavailable"; + return; }; } @@ -173,6 +177,7 @@ function onMessage(e) { + `<a class="button" href="client.html?mode=join&ip=${ipport}${asset}">Join</a></li>`; } masterserver.close(); + return; } else if (header === "servercheok") { const args = msg.split("#").slice(1); |