From 7955d3edd473e64d431d5b4ee9985d93f2b82a0d Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 15 Feb 2020 13:28:31 +0100 Subject: make charselect depend on the display width --- webAO/client.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'webAO/client.js') diff --git a/webAO/client.js b/webAO/client.js index 0c03c12..f5511c1 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -30,7 +30,7 @@ let mode = queryDict.mode; const AO_HOST = queryDict.asset || "http://s3.wasabisys.com/webao/base/"; const THEME = queryDict.theme || "default"; const MUSIC_HOST = AO_HOST + "sounds/music/"; -const CHAR_SELECT_WIDTH = 8; + const UPDATE_INTERVAL = 60; /** @@ -868,7 +868,7 @@ class Client extends EventEmitter { if (mode === "watch") { // Spectators don't need to pick a character document.getElementById("client_charselect").style.display = "none"; } else { - document.getElementById("client_charselect").style.display = "block"; + document.getElementById("client_charselect").style.display = "grid"; } } @@ -1042,19 +1042,17 @@ class Client extends EventEmitter { // create the charselect grid, to be filled by the character loader document.getElementById("client_chartable").innerHTML = ""; - let tr; + for (let i = 0; i < this.char_list_length; i++) { - if (i % CHAR_SELECT_WIDTH === 0) { - tr = document.createElement("TR"); - } - const td = document.createElement("TD"); + const demothing = document.createElement("img"); - td.innerHTML = ``; + demothing.className = "demothing"; + demothing.id = `demo_${i}`; + const demoonclick = document.createAttribute("onclick"); + demoonclick.value = `pickChar(${i})`; + demothing.setAttributeNode(demoonclick); - tr.appendChild(td); - if (i % CHAR_SELECT_WIDTH === 0) { - document.getElementById("client_chartable").appendChild(tr); - } + document.getElementById("client_chartable").appendChild(demothing); } // this is determined at the top of this file @@ -1898,7 +1896,7 @@ window.iniedit = iniedit; */ export function changeCharacter(_event) { client.sendLeaveRoom(); - document.getElementById("client_charselect").style.display = "block"; + document.getElementById("client_charselect").style.display = "grid"; document.getElementById("client_emo").innerHTML = ""; } window.changeCharacter = changeCharacter; -- cgit From 97d81ab021b9021838e84c9adc833ee3c13854a2 Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 15 Feb 2020 22:13:20 +0100 Subject: change darkening --- webAO/client.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'webAO/client.js') diff --git a/webAO/client.js b/webAO/client.js index f5511c1..6cf8569 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -1070,18 +1070,12 @@ class Client extends EventEmitter { handleCharsCheck(args) { for (let i = 0; i < this.char_list_length; i++) { let img = document.getElementById(`demo_${i}`); - let icon_chosen = "demothing"; - - if (img.classList.contains("noini")) - icon_chosen += " noini"; if (args[i + 1] === "-1") - icon_chosen += " dark"; - - img.classList = icon_chosen; + img.style = "opacity: 0.25"; + else if (args[i + 1] === "0") + img.style = ""; } - - //changeBackground("def"); } /** -- cgit From f6027422107d5a9d584fa25533b2c25655ff6ecb Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 15 Feb 2020 22:21:36 +0100 Subject: grid is too new for some browsers --- webAO/client.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webAO/client.js') diff --git a/webAO/client.js b/webAO/client.js index 6cf8569..7af47a2 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -868,7 +868,7 @@ class Client extends EventEmitter { if (mode === "watch") { // Spectators don't need to pick a character document.getElementById("client_charselect").style.display = "none"; } else { - document.getElementById("client_charselect").style.display = "grid"; + document.getElementById("client_charselect").style.display = ""; } } @@ -1890,7 +1890,7 @@ window.iniedit = iniedit; */ export function changeCharacter(_event) { client.sendLeaveRoom(); - document.getElementById("client_charselect").style.display = "grid"; + document.getElementById("client_charselect").style.display = ""; document.getElementById("client_emo").innerHTML = ""; } window.changeCharacter = changeCharacter; -- cgit From 471cce5bcb7c41c34849a608e541b7d84dc512c9 Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 15 Feb 2020 22:25:09 +0100 Subject: change it back to block --- webAO/client.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webAO/client.js') diff --git a/webAO/client.js b/webAO/client.js index 7af47a2..807ba46 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -868,7 +868,7 @@ class Client extends EventEmitter { if (mode === "watch") { // Spectators don't need to pick a character document.getElementById("client_charselect").style.display = "none"; } else { - document.getElementById("client_charselect").style.display = ""; + document.getElementById("client_charselect").style.display = "block"; } } @@ -1890,7 +1890,7 @@ window.iniedit = iniedit; */ export function changeCharacter(_event) { client.sendLeaveRoom(); - document.getElementById("client_charselect").style.display = ""; + document.getElementById("client_charselect").style.display = "block"; document.getElementById("client_emo").innerHTML = ""; } window.changeCharacter = changeCharacter; -- cgit