From 64ca5ccad6c93e0c8ac5f892d8a1de46b5fa4ca1 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 29 Mar 2022 19:25:43 +0200 Subject: delete index.html in masterlist --- webAO/master.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webAO/master.ts') diff --git a/webAO/master.ts b/webAO/master.ts index 5c538d4..5a31024 100644 --- a/webAO/master.ts +++ b/webAO/master.ts @@ -132,7 +132,7 @@ function cachedServerlist(response: Response) { } function processServerlist(thelist: { name: string, description: string, ip: string, port: number, ws_port: number, assets: string, online: string }[]) { - const myURL: string = window.location.href.replace('https://','http://'); + const myURL: string = window.location.href.replace('https://','http://').replace('index.html',''); for (let i = 0; i < thelist.length - 1; i++) { const serverEntry: { name: string, description: string, ip: string, port: number, ws_port: number, assets: string, online: string } = thelist[i]; -- cgit From 0bff001a1dd5ed8ba83aba4a9de116d566347124 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Fri, 23 Sep 2022 17:53:12 +0200 Subject: no more undefined --- webAO/master.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'webAO/master.ts') diff --git a/webAO/master.ts b/webAO/master.ts index 5a31024..2527323 100644 --- a/webAO/master.ts +++ b/webAO/master.ts @@ -20,10 +20,10 @@ let selectedServer: number = -1; let servers: { name: string, description: string, ip: string, port: number, ws_port: number, assets: string, online: string }[] = []; servers[-2] = { - name: 'Singleplayer', description: 'Build cases, try out new things', ip: '127.0.0.1', port: 50001, ws_port: 50001, assets: '', online: '', + name: 'Singleplayer', description: 'Build cases, try out new things', ip: '127.0.0.1', port: 50001, ws_port: 50001, assets: '', online: 'Online: 0/1', }; servers[-1] = { - name: 'Localhost', description: 'This is your computer on port 50001', ip: '127.0.0.1', port: 50001, ws_port: 50001, assets: '', online: 'Online: ?/?', + name: 'Localhost', description: 'This is your computer on port 50001', ip: '127.0.0.1', port: 50001, ws_port: 50001, assets: '', online: 'Offline', }; const fpPromise = FingerprintJS.load(); @@ -58,11 +58,7 @@ export function setServ(ID: number) { if (document.getElementById(`server${ID}`).className === '') { checkOnline(ID, `${servers[ID].ip}:${servers[ID].ws_port}`); } - if (servers[ID].description !== undefined) { - document.getElementById('serverdescription_content').innerHTML = `${servers[ID].online}
${safeTags(servers[ID].description)}`; - } else { - document.getElementById('serverdescription_content').innerHTML = ''; - } + document.getElementById('serverdescription_content').innerHTML = `${servers[ID].online}
${safeTags(servers[ID].description)}`; } window.setServ = setServ; @@ -136,6 +132,7 @@ function processServerlist(thelist: { name: string, description: string, ip: str for (let i = 0; i < thelist.length - 1; i++) { const serverEntry: { name: string, description: string, ip: string, port: number, ws_port: number, assets: string, online: string } = thelist[i]; + servers[i].online = "Offline"; servers[i] = serverEntry; const ipport = `${serverEntry.ip}:${serverEntry.ws_port}`; -- cgit From a732a654c058842e39917210e47ca7476fa7ef68 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Fri, 23 Sep 2022 17:56:54 +0200 Subject: swap lines --- webAO/master.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webAO/master.ts') diff --git a/webAO/master.ts b/webAO/master.ts index 2527323..7e9c994 100644 --- a/webAO/master.ts +++ b/webAO/master.ts @@ -132,8 +132,8 @@ function processServerlist(thelist: { name: string, description: string, ip: str for (let i = 0; i < thelist.length - 1; i++) { const serverEntry: { name: string, description: string, ip: string, port: number, ws_port: number, assets: string, online: string } = thelist[i]; - servers[i].online = "Offline"; servers[i] = serverEntry; + servers[i].online = "Offline"; const ipport = `${serverEntry.ip}:${serverEntry.ws_port}`; -- cgit