diff options
Diffstat (limited to 'webAO/viewport')
| -rw-r--r-- | webAO/viewport/utils/handleICSpeaking.ts | 8 | ||||
| -rw-r--r-- | webAO/viewport/viewport.ts | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/webAO/viewport/utils/handleICSpeaking.ts b/webAO/viewport/utils/handleICSpeaking.ts index 84946d2..7913554 100644 --- a/webAO/viewport/utils/handleICSpeaking.ts +++ b/webAO/viewport/utils/handleICSpeaking.ts @@ -317,7 +317,7 @@ export const handle_ic_speaking = async (playerChatMsg: ChatMsg) => { } else if (effectName.endsWith("strong")) { intensity = 400; } - if (intensity < fg.childElementCount) fg.innerHTML = ""; + if (intensity < fg.childElementCount) fg.replaceChildren(); else intensity = intensity - fg.childElementCount; for (let i = 0; i < intensity; i++) { @@ -331,11 +331,11 @@ export const handle_ic_speaking = async (playerChatMsg: ChatMsg) => { !badEffects.includes(effectName) ) { (<HTMLLinkElement>document.getElementById("effect_css")).href = ""; - fg.innerHTML = ""; + fg.replaceChildren(); const baseEffectUrl = `${AO_HOST}themes/default/effects/`; fg.src = `${baseEffectUrl}${encodeURI(effectName)}.webp`; } else { - fg.innerHTML = ""; + fg.replaceChildren(); fg.src = transparentPng; } @@ -353,7 +353,7 @@ export const handle_ic_speaking = async (playerChatMsg: ChatMsg) => { const output: HTMLSpanElement[] = []; for (const letter of client.viewport.getChatmsg().content) { const currentSelector = document.createElement("span"); - currentSelector.innerHTML = letter; + currentSelector.textContent = letter; currentSelector.className = `text_${COLORS[client.viewport.getChatmsg().color]}`; output.push(currentSelector); } diff --git a/webAO/viewport/viewport.ts b/webAO/viewport/viewport.ts index 1421c67..f13c311 100644 --- a/webAO/viewport/viewport.ts +++ b/webAO/viewport/viewport.ts @@ -197,11 +197,11 @@ const viewport = (): Viewport => { const textSpeeds = new Set(["{", "}"]); // Changing Text Speed - if (textSpeeds.has(characterElement.innerHTML)) { + if (textSpeeds.has(characterElement.textContent)) { // Grab them all in a row const MAX_SLOW_CHATSPEED = 120; for (let i = textnow.length; i < chatmsg.content.length; i++) { - const currentCharacter = chatmsg.parsed[i - 1].innerHTML; + const currentCharacter = chatmsg.parsed[i - 1].textContent; if (currentCharacter === "}") { if (chatmsg.speed > 0) { chatmsg.speed -= 20; @@ -219,12 +219,12 @@ const viewport = (): Viewport => { } if ( - characterElement.innerHTML === COMMAND_IDENTIFIER && - (commands.has(nextCharacterElement?.innerHTML) || - nextCharacterElement?.innerHTML === "p") + characterElement.textContent === COMMAND_IDENTIFIER && + (commands.has(nextCharacterElement?.textContent) || + nextCharacterElement?.textContent === "p") ) { textnow = chatmsg.content.substring(0, textnow.length + 1); - const commandChar = nextCharacterElement.innerHTML; + const commandChar = nextCharacterElement.textContent; if (commandChar === "p") { // Collect digits after \p for pause duration @@ -233,9 +233,9 @@ const viewport = (): Viewport => { let offset = 1; while ( startPos + offset <= chatmsg.content.length && - /\d/.test(chatmsg.parsed[startPos + offset - 1]?.innerHTML || "") + /\d/.test(chatmsg.parsed[startPos + offset - 1]?.textContent || "") ) { - digits += chatmsg.parsed[startPos + offset - 1].innerHTML; + digits += chatmsg.parsed[startPos + offset - 1].textContent; textnow = chatmsg.content.substring(0, startPos + offset); offset++; } |
