aboutsummaryrefslogtreecommitdiff
path: root/webAO/dom
diff options
context:
space:
mode:
Diffstat (limited to 'webAO/dom')
-rw-r--r--webAO/dom/addEvidence.ts16
-rw-r--r--webAO/dom/changeBackgroundOOC.ts2
-rw-r--r--webAO/dom/changeMusicVolume.ts2
-rw-r--r--webAO/dom/changeVolume.js6
-rw-r--r--webAO/dom/musicListFilter.ts18
-rw-r--r--webAO/dom/muteListClick.ts20
-rw-r--r--webAO/dom/onEnter.ts183
-rw-r--r--webAO/dom/opusCheck.ts28
-rw-r--r--webAO/dom/reconnectButton.ts2
-rw-r--r--webAO/dom/resetOffset.ts4
-rw-r--r--webAO/dom/toggleEffect.js10
-rw-r--r--webAO/dom/toggleElement.js12
-rw-r--r--webAO/dom/twofactor.ts4
-rw-r--r--webAO/dom/updateActionCommands.ts2
-rw-r--r--webAO/dom/updateBackgroundPreview.ts4
-rw-r--r--webAO/dom/window.ts2
16 files changed, 157 insertions, 158 deletions
diff --git a/webAO/dom/addEvidence.ts b/webAO/dom/addEvidence.ts
index 8a13f06..84c7fae 100644
--- a/webAO/dom/addEvidence.ts
+++ b/webAO/dom/addEvidence.ts
@@ -4,17 +4,17 @@ import { cancelEvidence } from "./cancelEvidence";
/**
* Add evidence.
*/
- export function addEvidence() {
+export function addEvidence() {
const evidence_select = <HTMLSelectElement>(
document.getElementById("evi_select")
);
client.sender.sendPE(
- (<HTMLInputElement>document.getElementById("evi_name")).value,
- (<HTMLInputElement>document.getElementById("evi_desc")).value,
- evidence_select.selectedIndex === 0
- ? (<HTMLInputElement>document.getElementById("evi_filename")).value
- : evidence_select.options[evidence_select.selectedIndex].text
+ (<HTMLInputElement>document.getElementById("evi_name")).value,
+ (<HTMLInputElement>document.getElementById("evi_desc")).value,
+ evidence_select.selectedIndex === 0
+ ? (<HTMLInputElement>document.getElementById("evi_filename")).value
+ : evidence_select.options[evidence_select.selectedIndex].text
);
cancelEvidence();
- }
- window.addEvidence = addEvidence; \ No newline at end of file
+}
+window.addEvidence = addEvidence; \ No newline at end of file
diff --git a/webAO/dom/changeBackgroundOOC.ts b/webAO/dom/changeBackgroundOOC.ts
index 1608ebe..55ce238 100644
--- a/webAO/dom/changeBackgroundOOC.ts
+++ b/webAO/dom/changeBackgroundOOC.ts
@@ -1,7 +1,7 @@
import queryParser from '../utils/queryParser'
import { client } from '../client'
-let { mode } = queryParser()
+const { mode } = queryParser()
/**
* Change background via OOC.
diff --git a/webAO/dom/changeMusicVolume.ts b/webAO/dom/changeMusicVolume.ts
index 9e5d51a..b54661b 100644
--- a/webAO/dom/changeMusicVolume.ts
+++ b/webAO/dom/changeMusicVolume.ts
@@ -5,7 +5,7 @@ export const changeMusicVolume = (volume: number = -1) => {
const clientVolume = Number(
(<HTMLInputElement>document.getElementById("client_mvolume")).value
);
- let musicVolume = volume === -1 ? clientVolume : volume;
+ const musicVolume = volume === -1 ? clientVolume : volume;
client.viewport.music.forEach(
(channel: HTMLAudioElement) => (channel.volume = musicVolume)
);
diff --git a/webAO/dom/changeVolume.js b/webAO/dom/changeVolume.js
index b79204a..c62d933 100644
--- a/webAO/dom/changeVolume.js
+++ b/webAO/dom/changeVolume.js
@@ -5,7 +5,7 @@ import setCookie from '../utils/setCookie.ts';
*/
export function changeSFXVolume() {
- setCookie('sfxVolume', document.getElementById('client_sfxaudio').volume);
+ setCookie('sfxVolume', document.getElementById('client_sfxaudio').volume);
}
window.changeSFXVolume = changeSFXVolume;
@@ -13,7 +13,7 @@ window.changeSFXVolume = changeSFXVolume;
* Triggered by the testimony volume slider.
*/
export function changeTestimonyVolume() {
- setCookie('testimonyVolume', document.getElementById('client_testimonyaudio').volume);
+ setCookie('testimonyVolume', document.getElementById('client_testimonyaudio').volume);
}
window.changeTestimonyVolume = changeTestimonyVolume;
@@ -22,6 +22,6 @@ window.changeTestimonyVolume = changeTestimonyVolume;
*/
export function changeShoutVolume() {
- setCookie('shoutVolume', document.getElementById('client_shoutaudio').volume);
+ setCookie('shoutVolume', document.getElementById('client_shoutaudio').volume);
}
window.changeShoutVolume = changeShoutVolume;
diff --git a/webAO/dom/musicListFilter.ts b/webAO/dom/musicListFilter.ts
index 3db7fcd..b5284a2 100644
--- a/webAO/dom/musicListFilter.ts
+++ b/webAO/dom/musicListFilter.ts
@@ -4,21 +4,21 @@ import { client } from '../client'
* @param {MouseEvent} event
*/
export function musiclist_filter(_event: Event) {
- const musiclist_element = <HTMLSelectElement>(
+ const musiclist_element = <HTMLSelectElement>(
document.getElementById("client_musiclist")
);
- const searchname = (<HTMLInputElement>(
+ const searchname = (<HTMLInputElement>(
document.getElementById("client_musicsearch")
)).value;
- musiclist_element.innerHTML = "";
+ musiclist_element.innerHTML = "";
- for (const trackname of client.musics) {
- if (trackname.toLowerCase().indexOf(searchname.toLowerCase()) !== -1) {
- const newentry = <HTMLOptionElement>document.createElement("OPTION");
- newentry.text = trackname;
- musiclist_element.options.add(newentry);
+ for (const trackname of client.musics) {
+ if (trackname.toLowerCase().indexOf(searchname.toLowerCase()) !== -1) {
+ const newentry = <HTMLOptionElement>document.createElement("OPTION");
+ newentry.text = trackname;
+ musiclist_element.options.add(newentry);
+ }
}
- }
}
window.musiclist_filter = musiclist_filter; \ No newline at end of file
diff --git a/webAO/dom/muteListClick.ts b/webAO/dom/muteListClick.ts
index e7c9357..51bdd3d 100644
--- a/webAO/dom/muteListClick.ts
+++ b/webAO/dom/muteListClick.ts
@@ -4,16 +4,16 @@ import { client } from "../client";
* @param {MouseEvent} event
*/
export function mutelist_click(_event: Event) {
- const mutelist = <HTMLSelectElement>(document.getElementById('mute_select'));
- const selected_character = mutelist.options[mutelist.selectedIndex];
+ const mutelist = <HTMLSelectElement>(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;
- }
+ 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
diff --git a/webAO/dom/onEnter.ts b/webAO/dom/onEnter.ts
index 5ab532c..4948783 100644
--- a/webAO/dom/onEnter.ts
+++ b/webAO/dom/onEnter.ts
@@ -1,103 +1,102 @@
import { client, selectedShout } from "../client";
import { escapeChat } from "../encoding";
-
/**
* Triggered when the Return key is pressed on the in-character chat input box.
* @param {KeyboardEvent} event
*/
- export function onEnter(event: KeyboardEvent) {
+export function onEnter(event: KeyboardEvent) {
if (event.keyCode === 13) {
- const mychar = client.character;
- const myemo = client.emote;
- const evi = client.evidence;
- const flip = Boolean(
- document.getElementById("button_flip")!.classList.contains("dark")
- );
- const flash = Boolean(
- document.getElementById("button_flash")!.classList.contains("dark")
- );
- const screenshake = Boolean(
- document.getElementById("button_shake")!.classList.contains("dark")
- );
- const noninterrupting_preanim = Boolean(
- (<HTMLInputElement>document.getElementById("check_nonint")).checked
- );
- const looping_sfx = Boolean(
- (<HTMLInputElement>document.getElementById("check_loopsfx")).checked
- );
- const color = Number(
- (<HTMLInputElement>document.getElementById("textcolor")).value
- );
- const showname = escapeChat(
- (<HTMLInputElement>document.getElementById("ic_chat_name")).value
- );
- const text = (<HTMLInputElement>document.getElementById("client_inputbox"))
- .value;
- const pairchar = (<HTMLInputElement>document.getElementById("pair_select"))
- .value;
- const pairoffset = Number(
- (<HTMLInputElement>document.getElementById("pair_offset")).value
- );
- const pairyoffset = Number(
- (<HTMLInputElement>document.getElementById("pair_y_offset")).value
- );
- const myrole = (<HTMLInputElement>document.getElementById("role_select"))
- .value
- ? (<HTMLInputElement>document.getElementById("role_select")).value
- : mychar.side;
- const additive = Boolean(
- (<HTMLInputElement>document.getElementById("check_additive")).checked
- );
- const effect = (<HTMLInputElement>document.getElementById("effect_select"))
- .value;
-
- let sfxname = "0";
- let sfxdelay = 0;
- let emote_mod = myemo.zoom;
- if ((<HTMLInputElement>document.getElementById("sendsfx")).checked) {
- sfxname = myemo.sfx;
- sfxdelay = myemo.sfxdelay;
- }
-
- // not to overwrite a 5 from the ini or anything else
- if ((<HTMLInputElement>document.getElementById("sendpreanim")).checked) {
- if (emote_mod === 0) {
- emote_mod = 1;
+ const mychar = client.character;
+ const myemo = client.emote;
+ const evi = client.evidence;
+ const flip = Boolean(
+ document.getElementById("button_flip")!.classList.contains("dark")
+ );
+ const flash = Boolean(
+ document.getElementById("button_flash")!.classList.contains("dark")
+ );
+ const screenshake = Boolean(
+ document.getElementById("button_shake")!.classList.contains("dark")
+ );
+ const noninterrupting_preanim = Boolean(
+ (<HTMLInputElement>document.getElementById("check_nonint")).checked
+ );
+ const looping_sfx = Boolean(
+ (<HTMLInputElement>document.getElementById("check_loopsfx")).checked
+ );
+ const color = Number(
+ (<HTMLInputElement>document.getElementById("textcolor")).value
+ );
+ const showname = escapeChat(
+ (<HTMLInputElement>document.getElementById("ic_chat_name")).value
+ );
+ const text = (<HTMLInputElement>document.getElementById("client_inputbox"))
+ .value;
+ const pairchar = (<HTMLInputElement>document.getElementById("pair_select"))
+ .value;
+ const pairoffset = Number(
+ (<HTMLInputElement>document.getElementById("pair_offset")).value
+ );
+ const pairyoffset = Number(
+ (<HTMLInputElement>document.getElementById("pair_y_offset")).value
+ );
+ const myrole = (<HTMLInputElement>document.getElementById("role_select"))
+ .value
+ ? (<HTMLInputElement>document.getElementById("role_select")).value
+ : mychar.side;
+ const additive = Boolean(
+ (<HTMLInputElement>document.getElementById("check_additive")).checked
+ );
+ const effect = (<HTMLInputElement>document.getElementById("effect_select"))
+ .value;
+
+ let sfxname = "0";
+ let sfxdelay = 0;
+ let emote_mod = myemo.zoom;
+ if ((<HTMLInputElement>document.getElementById("sendsfx")).checked) {
+ sfxname = myemo.sfx;
+ sfxdelay = myemo.sfxdelay;
}
- } else if (emote_mod === 1) {
- emote_mod = 0;
- }
-
- client.sender.sendIC(
- myemo.deskmod,
- myemo.preanim,
- mychar.name,
- myemo.emote,
- text,
- myrole,
- sfxname,
- emote_mod,
- sfxdelay,
- selectedShout,
- evi,
- flip,
- flash,
- color,
- showname,
- pairchar,
- pairoffset,
- pairyoffset,
- noninterrupting_preanim,
- looping_sfx,
- screenshake,
- "-",
- "-",
- "-",
- additive,
- effect
- );
+
+ // not to overwrite a 5 from the ini or anything else
+ if ((<HTMLInputElement>document.getElementById("sendpreanim")).checked) {
+ if (emote_mod === 0) {
+ emote_mod = 1;
+ }
+ } else if (emote_mod === 1) {
+ emote_mod = 0;
+ }
+
+ client.sender.sendIC(
+ myemo.deskmod,
+ myemo.preanim,
+ mychar.name,
+ myemo.emote,
+ text,
+ myrole,
+ sfxname,
+ emote_mod,
+ sfxdelay,
+ selectedShout,
+ evi,
+ flip,
+ flash,
+ color,
+ showname,
+ pairchar,
+ pairoffset,
+ pairyoffset,
+ noninterrupting_preanim,
+ looping_sfx,
+ screenshake,
+ "-",
+ "-",
+ "-",
+ additive,
+ effect
+ );
}
return false;
- }
- window.onEnter = onEnter; \ No newline at end of file
+}
+window.onEnter = onEnter;
diff --git a/webAO/dom/opusCheck.ts b/webAO/dom/opusCheck.ts
index 5f0248d..608a30a 100644
--- a/webAO/dom/opusCheck.ts
+++ b/webAO/dom/opusCheck.ts
@@ -3,20 +3,20 @@
* @param {HTMLAudioElement} image the element containing the missing sound
*/
export function opusCheck(
- channel: HTMLAudioElement
+ channel: HTMLAudioElement
): OnErrorEventHandlerNonNull {
- const audio = channel.src;
- if (audio === "") {
- return;
- }
- console.warn(`failed to load sound ${channel.src}`);
- let oldsrc = "";
- let newsrc = "";
- oldsrc = channel.src;
- if (!oldsrc.endsWith(".opus")) {
- newsrc = oldsrc.replace(".mp3", ".opus");
- newsrc = newsrc.replace(".wav", ".opus");
- channel.src = newsrc; // unload so the old sprite doesn't persist
- }
+ const audio = channel.src;
+ if (audio === "") {
+ return;
+ }
+ console.warn(`failed to load sound ${channel.src}`);
+ let oldsrc = "";
+ let newsrc = "";
+ oldsrc = channel.src;
+ if (!oldsrc.endsWith(".opus")) {
+ newsrc = oldsrc.replace(".mp3", ".opus");
+ newsrc = newsrc.replace(".wav", ".opus");
+ channel.src = newsrc; // unload so the old sprite doesn't persist
+ }
}
window.opusCheck = opusCheck; \ No newline at end of file
diff --git a/webAO/dom/reconnectButton.ts b/webAO/dom/reconnectButton.ts
index 4031ccd..76a6b51 100644
--- a/webAO/dom/reconnectButton.ts
+++ b/webAO/dom/reconnectButton.ts
@@ -1,6 +1,6 @@
import Client, { client, setClient } from "../client";
import queryParser from "../utils/queryParser";
-let { ip: serverIP } = queryParser();
+const { ip: serverIP } = queryParser();
/**
* Triggered when the reconnect button is pushed.
diff --git a/webAO/dom/resetOffset.ts b/webAO/dom/resetOffset.ts
index 86dfd5b..8b1a2fd 100644
--- a/webAO/dom/resetOffset.ts
+++ b/webAO/dom/resetOffset.ts
@@ -1,6 +1,6 @@
export function resetOffset(_event: Event) {
- (<HTMLInputElement>document.getElementById("pair_offset")).value = "0";
- (<HTMLInputElement>document.getElementById("pair_y_offset")).value = "0";
+ (<HTMLInputElement>document.getElementById("pair_offset")).value = "0";
+ (<HTMLInputElement>document.getElementById("pair_y_offset")).value = "0";
}
window.resetOffset = resetOffset; \ No newline at end of file
diff --git a/webAO/dom/toggleEffect.js b/webAO/dom/toggleEffect.js
index 699937b..d9ba421 100644
--- a/webAO/dom/toggleEffect.js
+++ b/webAO/dom/toggleEffect.js
@@ -6,11 +6,11 @@
* @param {string} effect the new effect to be selected
*/
export function toggleEffect(button) {
- if (button.classList.contains('dark')) {
- button.className = 'client_button';
- } else {
- button.className = 'client_button dark';
- }
+ if (button.classList.contains('dark')) {
+ button.className = 'client_button';
+ } else {
+ button.className = 'client_button dark';
+ }
}
window.toggleEffect = toggleEffect;
export default toggleEffect;
diff --git a/webAO/dom/toggleElement.js b/webAO/dom/toggleElement.js
index 6d4c194..3d4ceb2 100644
--- a/webAO/dom/toggleElement.js
+++ b/webAO/dom/toggleElement.js
@@ -3,12 +3,12 @@
* @param {string} elementId the id of the element to toggle
*/
export function toggleElement(elementId) {
- const element = document.getElementById(elementId);
- if (element.style.display !== 'none') {
- element.style.display = 'none';
- } else {
- element.style.display = 'block';
- }
+ const element = document.getElementById(elementId);
+ if (element.style.display !== 'none') {
+ element.style.display = 'none';
+ } else {
+ element.style.display = 'block';
+ }
}
window.toggleElement = toggleElement;
export default toggleElement;
diff --git a/webAO/dom/twofactor.ts b/webAO/dom/twofactor.ts
index b7e947a..d0076bf 100644
--- a/webAO/dom/twofactor.ts
+++ b/webAO/dom/twofactor.ts
@@ -2,9 +2,9 @@ import { client } from "../client";
function handleCredentialResponse(response: any) {
client.sender.sendServer(`2T#${response.credential}#%`);
- }
+}
window.handleCredentialResponse = handleCredentialResponse;
export function showFactorDialog(args: string[]) {
- document.getElementById("client_secondfactor").style.display = args[1];
+ document.getElementById("client_secondfactor").style.display = args[1];
} \ No newline at end of file
diff --git a/webAO/dom/updateActionCommands.ts b/webAO/dom/updateActionCommands.ts
index 9d0bd82..ca8ca60 100644
--- a/webAO/dom/updateActionCommands.ts
+++ b/webAO/dom/updateActionCommands.ts
@@ -14,7 +14,7 @@ export function updateActionCommands(side: string) {
// Update role selector
for (
let i = 0,
- role_select = <HTMLSelectElement>document.getElementById("role_select");
+ role_select = <HTMLSelectElement>document.getElementById("role_select");
i < role_select.options.length;
i++
) {
diff --git a/webAO/dom/updateBackgroundPreview.ts b/webAO/dom/updateBackgroundPreview.ts
index 01b5c44..659d4cb 100644
--- a/webAO/dom/updateBackgroundPreview.ts
+++ b/webAO/dom/updateBackgroundPreview.ts
@@ -21,8 +21,8 @@ export function updateBackgroundPreview() {
background_filename.style.display = "none";
}
tryUrls(`${AO_HOST}background/${encodeURI(
- background_select.value.toLowerCase()
- )}/defenseempty`).then((resp) => {
+ background_select.value.toLowerCase()
+ )}/defenseempty`).then((resp) => {
background_preview.src = resp;
});
}
diff --git a/webAO/dom/window.ts b/webAO/dom/window.ts
index 0b3bd34..ca9cde5 100644
--- a/webAO/dom/window.ts
+++ b/webAO/dom/window.ts
@@ -20,7 +20,7 @@ declare global {
updateIniswap: () => void;
resizeChatbox: () => void;
setChatbox: (style: string) => void;
- getIndexFromSelect: (select_box: string, value: string) => Number;
+ getIndexFromSelect: (select_box: string, value: string) => number;
cancelEvidence: () => void;
deleteEvidence: () => void;
editEvidence: () => void;