From e50167a8077b0ada769cdf785971972c3ad865f7 Mon Sep 17 00:00:00 2001 From: Caleb Date: Fri, 9 Sep 2022 18:30:07 -0400 Subject: Pulled out everything I wanted --- webAO/dom/showNameClick.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webAO/dom') diff --git a/webAO/dom/showNameClick.ts b/webAO/dom/showNameClick.ts index 265f6c8..3e48b70 100644 --- a/webAO/dom/showNameClick.ts +++ b/webAO/dom/showNameClick.ts @@ -5,7 +5,7 @@ import setCookie from "../utils/setCookie"; * Triggered when the showname checkboc is clicked * @param {MouseEvent} event */ -export function showname_click(_event: Event) { +export function showname_click(_event: Event | null) { setCookie( "showname", String((document.getElementById("showname")).checked) -- cgit From 93979636fb5d1c60f0da3290e80eb3ca9ead992f Mon Sep 17 00:00:00 2001 From: Caleb Date: Fri, 9 Sep 2022 18:46:42 -0400 Subject: Migrated functions --- webAO/dom/iniEdit.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'webAO/dom') diff --git a/webAO/dom/iniEdit.ts b/webAO/dom/iniEdit.ts index 359a226..0710de9 100644 --- a/webAO/dom/iniEdit.ts +++ b/webAO/dom/iniEdit.ts @@ -1,4 +1,5 @@ import { client } from "../client"; +import { handleCharacterInfo } from "../client/handleCharacterInfo"; import { packetHandler } from "../packets/packetHandler"; /** @@ -8,7 +9,7 @@ export async function iniedit() { const ininame = (document.getElementById("client_ininame")) .value; const inicharID = client.charID; - await client.handleCharacterInfo(ininame.split("&"), inicharID); + await handleCharacterInfo(ininame.split("&"), inicharID); packetHandler.get("PV")!(`PV#0#CID#${inicharID}`.split("#")); } window.iniedit = iniedit; -- cgit From 108636666d474119892c4b3a2f3beadb767b006e Mon Sep 17 00:00:00 2001 From: Caleb Date: Sat, 10 Sep 2022 11:09:49 -0400 Subject: Structured viewport a little differently --- webAO/dom/changeBlipVolume.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 webAO/dom/changeBlipVolume.ts (limited to 'webAO/dom') diff --git a/webAO/dom/changeBlipVolume.ts b/webAO/dom/changeBlipVolume.ts new file mode 100644 index 0000000..572f389 --- /dev/null +++ b/webAO/dom/changeBlipVolume.ts @@ -0,0 +1,15 @@ +import setCookie from "../utils/setCookie"; +import { client } from '../client' +/** + * Triggered by the blip volume slider. + */ +export const changeBlipVolume = () => { + const blipVolume = (( + document.getElementById("client_bvolume") + )).value; + client.viewport.blipChannels.forEach( + (channel: HTMLAudioElement) => (channel.volume = Number(blipVolume)) + ); + setCookie("blipVolume", blipVolume); +} +window.changeBlipVolume = changeBlipVolume; -- cgit From 766bef212c09dc85a7afda085cbb9690f985ed8f Mon Sep 17 00:00:00 2001 From: Caleb Date: Sun, 11 Sep 2022 15:42:34 -0400 Subject: Music volume moved out of viewport --- webAO/dom/changeMusicVolume.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 webAO/dom/changeMusicVolume.ts (limited to 'webAO/dom') diff --git a/webAO/dom/changeMusicVolume.ts b/webAO/dom/changeMusicVolume.ts new file mode 100644 index 0000000..9e5d51a --- /dev/null +++ b/webAO/dom/changeMusicVolume.ts @@ -0,0 +1,14 @@ +import { client } from '../client' +import setCookie from '../utils/setCookie'; + +export const changeMusicVolume = (volume: number = -1) => { + const clientVolume = Number( + (document.getElementById("client_mvolume")).value + ); + let musicVolume = volume === -1 ? clientVolume : volume; + client.viewport.music.forEach( + (channel: HTMLAudioElement) => (channel.volume = musicVolume) + ); + setCookie("musicVolume", String(musicVolume)); +}; +window.changeMusicVolume = changeMusicVolume; \ No newline at end of file -- cgit From 3929d4cc4c217738cdda8ec02d1668d0fea20935 Mon Sep 17 00:00:00 2001 From: Caleb Date: Sun, 11 Sep 2022 16:26:37 -0400 Subject: Refactor theme --- webAO/dom/reloadTheme.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 webAO/dom/reloadTheme.ts (limited to 'webAO/dom') diff --git a/webAO/dom/reloadTheme.ts b/webAO/dom/reloadTheme.ts new file mode 100644 index 0000000..bfa46b6 --- /dev/null +++ b/webAO/dom/reloadTheme.ts @@ -0,0 +1,16 @@ +import { client } from '../client' +import setCookie from '../utils/setCookie'; + +/** + * Triggered by the theme selector. + */ +export const reloadTheme = () => { + client.viewport.setTheme((document.getElementById("client_themeselect")) + .value); + + setCookie("theme", client.viewport.getTheme()); + (( + document.getElementById("client_theme") + )).href = `styles/${client.viewport.getTheme()}.css`; +} +window.reloadTheme = reloadTheme; \ No newline at end of file -- cgit From 4a177accdacb718462f7c5e4bca90b20bdc360cf Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 12 Oct 2022 18:27:12 +0200 Subject: move cred response to dom folder --- webAO/dom/twofactor.ts | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 webAO/dom/twofactor.ts (limited to 'webAO/dom') diff --git a/webAO/dom/twofactor.ts b/webAO/dom/twofactor.ts new file mode 100644 index 0000000..145a00e --- /dev/null +++ b/webAO/dom/twofactor.ts @@ -0,0 +1,6 @@ +import { client } from "../client"; + +function handleCredentialResponse(response: any) { + client.sender.sendServer(`2T#${response.credential}#%`); + } +window.handleCredentialResponse = handleCredentialResponse; \ No newline at end of file -- cgit From 3445fe86cd359080e6c21b18cb43f08bb5e5881a Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sat, 22 Oct 2022 17:55:00 +0200 Subject: add to window class --- webAO/dom/twofactor.ts | 1 + webAO/dom/window.ts | 1 + 2 files changed, 2 insertions(+) (limited to 'webAO/dom') diff --git a/webAO/dom/twofactor.ts b/webAO/dom/twofactor.ts index 145a00e..cb7bccd 100644 --- a/webAO/dom/twofactor.ts +++ b/webAO/dom/twofactor.ts @@ -1,6 +1,7 @@ import { client } from "../client"; function handleCredentialResponse(response: any) { + console.log(response); client.sender.sendServer(`2T#${response.credential}#%`); } window.handleCredentialResponse = handleCredentialResponse; \ No newline at end of file diff --git a/webAO/dom/window.ts b/webAO/dom/window.ts index 2535768..956526c 100644 --- a/webAO/dom/window.ts +++ b/webAO/dom/window.ts @@ -51,6 +51,7 @@ declare global { onEnter: (event: any) => void; onReplayGo: (_event: any) => void; onOOCEnter: (_event: any) => void; + handleCredentialResponse: (_event: any) => void; } } export { } \ No newline at end of file -- cgit From 4b015ddc346835fc97f40ca425666af45d7ec632 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sat, 22 Oct 2022 18:03:35 +0200 Subject: show the dialog --- webAO/dom/twofactor.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'webAO/dom') diff --git a/webAO/dom/twofactor.ts b/webAO/dom/twofactor.ts index cb7bccd..38a2bac 100644 --- a/webAO/dom/twofactor.ts +++ b/webAO/dom/twofactor.ts @@ -4,4 +4,8 @@ function handleCredentialResponse(response: any) { console.log(response); client.sender.sendServer(`2T#${response.credential}#%`); } -window.handleCredentialResponse = handleCredentialResponse; \ No newline at end of file +window.handleCredentialResponse = handleCredentialResponse; + +export function showFactorDialog() { + document.getElementById("client_secondfactor").style.display = "block"; +} \ No newline at end of file -- cgit From fb399fd938b9205c761237917af7d7f3bc52ffff Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sat, 22 Oct 2022 18:44:18 +0200 Subject: this is much nicer --- webAO/dom/twofactor.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webAO/dom') diff --git a/webAO/dom/twofactor.ts b/webAO/dom/twofactor.ts index 38a2bac..28b6e6c 100644 --- a/webAO/dom/twofactor.ts +++ b/webAO/dom/twofactor.ts @@ -6,6 +6,6 @@ function handleCredentialResponse(response: any) { } window.handleCredentialResponse = handleCredentialResponse; -export function showFactorDialog() { - document.getElementById("client_secondfactor").style.display = "block"; +export function showFactorDialog(display: string) { + document.getElementById("client_secondfactor").style.display = display; } \ No newline at end of file -- cgit From cc568bbc87d890a43e14728d9328b537afe090b7 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sat, 22 Oct 2022 19:37:28 +0200 Subject: whoops forgot args are a list --- webAO/dom/twofactor.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webAO/dom') diff --git a/webAO/dom/twofactor.ts b/webAO/dom/twofactor.ts index 28b6e6c..de569b9 100644 --- a/webAO/dom/twofactor.ts +++ b/webAO/dom/twofactor.ts @@ -6,6 +6,6 @@ function handleCredentialResponse(response: any) { } window.handleCredentialResponse = handleCredentialResponse; -export function showFactorDialog(display: string) { - document.getElementById("client_secondfactor").style.display = display; +export function showFactorDialog(args: string[]) { + document.getElementById("client_secondfactor").style.display = args[1]; } \ No newline at end of file -- cgit From 5cdcb94d763dec8105fd840ccc15e5c79922e81b Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Fri, 11 Nov 2022 11:45:32 +0100 Subject: more console spam --- webAO/dom/opusCheck.ts | 2 +- webAO/dom/resizeChatbox.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'webAO/dom') diff --git a/webAO/dom/opusCheck.ts b/webAO/dom/opusCheck.ts index 939fdc6..5f0248d 100644 --- a/webAO/dom/opusCheck.ts +++ b/webAO/dom/opusCheck.ts @@ -9,7 +9,7 @@ export function opusCheck( if (audio === "") { return; } - console.info(`failed to load sound ${channel.src}`); + console.warn(`failed to load sound ${channel.src}`); let oldsrc = ""; let newsrc = ""; oldsrc = channel.src; diff --git a/webAO/dom/resizeChatbox.ts b/webAO/dom/resizeChatbox.ts index efb8bdc..887877d 100644 --- a/webAO/dom/resizeChatbox.ts +++ b/webAO/dom/resizeChatbox.ts @@ -17,7 +17,6 @@ export function resizeChatbox() { let weekday = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]; const month = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; document.getElementById("client_clock_month")!.innerText = month[now.getMonth()]; - console.debug(CHATBOX); if (CHATBOX == "acww") { weekday = ["Su", "Mo", "Tu", "We", "Th", "Fr", "Sa"]; document.getElementById("client_clock_weekday")!.innerText = weekday[now.getDay()]; -- cgit From 79a2d2ea9f89550cbeaa738dfd7803e75be1a0cd Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Sun, 13 Nov 2022 20:13:14 +0100 Subject: bring back iniedit dropdown --- webAO/dom/twofactor.ts | 1 - 1 file changed, 1 deletion(-) (limited to 'webAO/dom') diff --git a/webAO/dom/twofactor.ts b/webAO/dom/twofactor.ts index de569b9..b7e947a 100644 --- a/webAO/dom/twofactor.ts +++ b/webAO/dom/twofactor.ts @@ -1,7 +1,6 @@ import { client } from "../client"; function handleCredentialResponse(response: any) { - console.log(response); client.sender.sendServer(`2T#${response.credential}#%`); } window.handleCredentialResponse = handleCredentialResponse; -- cgit From 2592bf4cb162cac88ecb52d036249ab52c16153c Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Thu, 17 Nov 2022 22:51:18 +0100 Subject: rename to iniselect --- webAO/dom/iniEdit.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webAO/dom') diff --git a/webAO/dom/iniEdit.ts b/webAO/dom/iniEdit.ts index 0710de9..fb05ae2 100644 --- a/webAO/dom/iniEdit.ts +++ b/webAO/dom/iniEdit.ts @@ -6,7 +6,7 @@ import { packetHandler } from "../packets/packetHandler"; * Triggered by the ini button. */ export async function iniedit() { - const ininame = (document.getElementById("client_ininame")) + const ininame = (document.getElementById("client_iniselect")) .value; const inicharID = client.charID; await handleCharacterInfo(ininame.split("&"), inicharID); -- cgit From 7d3a6dc03bb284e3bb711a4a0fa698d197e585ea Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Thu, 17 Nov 2022 22:55:36 +0100 Subject: both ini dropdown and custom --- webAO/dom/updateIniswap.ts | 18 ++++++++++++++++++ webAO/dom/window.ts | 1 + 2 files changed, 19 insertions(+) create mode 100644 webAO/dom/updateIniswap.ts (limited to 'webAO/dom') diff --git a/webAO/dom/updateIniswap.ts b/webAO/dom/updateIniswap.ts new file mode 100644 index 0000000..e040e64 --- /dev/null +++ b/webAO/dom/updateIniswap.ts @@ -0,0 +1,18 @@ +/** + * Update iniswap drowdown + */ +export function updateIniswap() { + const ini_select = ( + document.getElementById("evi_select") + ); + const ini_name = ( + document.getElementById("evi_filename") + ); + + if (ini_select.selectedIndex === 0) { + ini_filename.style.display = "initial"; + } else { + ini_filename.style.display = "none"; + } +} +window.updateIniswap = updateIniswap; diff --git a/webAO/dom/window.ts b/webAO/dom/window.ts index 956526c..0b3bd34 100644 --- a/webAO/dom/window.ts +++ b/webAO/dom/window.ts @@ -17,6 +17,7 @@ declare global { changeBackgroundOOC: () => void; updateActionCommands: (side: string) => void; updateEvidenceIcon: () => void; + updateIniswap: () => void; resizeChatbox: () => void; setChatbox: (style: string) => void; getIndexFromSelect: (select_box: string, value: string) => Number; -- cgit From 1ca093371aa446a79b76cd54e2ce822c2c39cdfd Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Thu, 17 Nov 2022 23:10:23 +0100 Subject: copypasta :spaghetti: --- webAO/dom/updateIniswap.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webAO/dom') diff --git a/webAO/dom/updateIniswap.ts b/webAO/dom/updateIniswap.ts index e040e64..251e1f1 100644 --- a/webAO/dom/updateIniswap.ts +++ b/webAO/dom/updateIniswap.ts @@ -10,9 +10,9 @@ export function updateIniswap() { ); if (ini_select.selectedIndex === 0) { - ini_filename.style.display = "initial"; + ini_name.style.display = "initial"; } else { - ini_filename.style.display = "none"; + ini_name.style.display = "none"; } } window.updateIniswap = updateIniswap; -- cgit From 2b78887579ba24355936ae75f912c55343bf0d0b Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Thu, 17 Nov 2022 23:17:07 +0100 Subject: :spaghetti: :spaghetti: :spaghetti: :spaghetti: :spaghetti: :spaghetti: :spaghetti: --- webAO/dom/updateIniswap.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webAO/dom') diff --git a/webAO/dom/updateIniswap.ts b/webAO/dom/updateIniswap.ts index 251e1f1..5bea0f5 100644 --- a/webAO/dom/updateIniswap.ts +++ b/webAO/dom/updateIniswap.ts @@ -3,10 +3,10 @@ */ export function updateIniswap() { const ini_select = ( - document.getElementById("evi_select") + document.getElementById("client_iniselect") ); const ini_name = ( - document.getElementById("evi_filename") + document.getElementById("client_ininame") ); if (ini_select.selectedIndex === 0) { -- cgit From fdf5fc329a48d9f6ed54d055f7b0e60cb65e35f3 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Fri, 18 Nov 2022 19:55:31 +0100 Subject: fix iniedit input box --- webAO/dom/iniEdit.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'webAO/dom') diff --git a/webAO/dom/iniEdit.ts b/webAO/dom/iniEdit.ts index fb05ae2..9d31259 100644 --- a/webAO/dom/iniEdit.ts +++ b/webAO/dom/iniEdit.ts @@ -6,10 +6,15 @@ import { packetHandler } from "../packets/packetHandler"; * Triggered by the ini button. */ export async function iniedit() { - const ininame = (document.getElementById("client_iniselect")) - .value; + const iniselect = (document.getElementById("client_iniselect")) + const ininame = (document.getElementById("client_ininame")); const inicharID = client.charID; - await handleCharacterInfo(ininame.split("&"), inicharID); + + const newname = iniselect.selectedIndex === 0 ? ininame.value : iniselect.value; + + await handleCharacterInfo(newname.split("&"), inicharID); packetHandler.get("PV")!(`PV#0#CID#${inicharID}`.split("#")); + + ); } window.iniedit = iniedit; -- cgit From f53a8293cf0d6f162008953ac6504a84959ee152 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Tue, 22 Nov 2022 19:59:58 +0100 Subject: where did this bracket come from --- webAO/dom/iniEdit.ts | 2 -- 1 file changed, 2 deletions(-) (limited to 'webAO/dom') diff --git a/webAO/dom/iniEdit.ts b/webAO/dom/iniEdit.ts index 9d31259..b26c179 100644 --- a/webAO/dom/iniEdit.ts +++ b/webAO/dom/iniEdit.ts @@ -14,7 +14,5 @@ export async function iniedit() { await handleCharacterInfo(newname.split("&"), inicharID); packetHandler.get("PV")!(`PV#0#CID#${inicharID}`.split("#")); - - ); } window.iniedit = iniedit; -- cgit From 2000fd9f433f470be461b4573eeb7f02bae8e8a3 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Wed, 7 Dec 2022 20:50:07 +0100 Subject: remove chat from chatbox names --- webAO/dom/setChatbox.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'webAO/dom') diff --git a/webAO/dom/setChatbox.ts b/webAO/dom/setChatbox.ts index 6d1a78c..095ead3 100644 --- a/webAO/dom/setChatbox.ts +++ b/webAO/dom/setChatbox.ts @@ -5,7 +5,7 @@ import setCookie from "../utils/setCookie"; /** * Set the style of the chatbox */ -export function setChatbox(style: string) { +export function setChatbox(setstyle: string) { const chatbox_theme = ( document.getElementById("chatbox_theme") ); @@ -16,6 +16,7 @@ export function setChatbox(style: string) { setCookie("chatbox", CHATBOX); if (CHATBOX === "dynamic") { + const style = setstyle.replace("chat",""); if (chatbox_arr.includes(style)) { chatbox_theme.href = `styles/chatbox/${style}.css`; } else { -- cgit From 95c688f3683ba6c1cabf39beeaf972e5bd80b6c4 Mon Sep 17 00:00:00 2001 From: stonedDiscord Date: Mon, 23 Jan 2023 22:27:28 +0100 Subject: bring mute back --- webAO/dom/muteListClick.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 webAO/dom/muteListClick.ts (limited to 'webAO/dom') diff --git a/webAO/dom/muteListClick.ts b/webAO/dom/muteListClick.ts new file mode 100644 index 0000000..e7c9357 --- /dev/null +++ b/webAO/dom/muteListClick.ts @@ -0,0 +1,19 @@ +import { client } from "../client"; +/** + * Triggered when a character in the mute list is clicked + * @param {MouseEvent} event + */ +export function mutelist_click(_event: Event) { + const mutelist = (document.getElementById('mute_select')); + const selected_character = mutelist.options[mutelist.selectedIndex]; + + if (client.chars[selected_character.value].muted === false) { + client.chars[selected_character.value].muted = true; + selected_character.text = `${client.chars[selected_character.value].name} (muted)`; + console.info(`muted ${client.chars[selected_character.value].name}`); + } else { + client.chars[selected_character.value].muted = false; + selected_character.text = client.chars[selected_character.value].name; + } +} +window.mutelist_click = mutelist_click; \ No newline at end of file -- cgit