diff options
| author | sD <stoned@derpymail.org> | 2019-12-22 19:37:44 +0100 |
|---|---|---|
| committer | sD <stoned@derpymail.org> | 2019-12-22 19:37:44 +0100 |
| commit | cc3ae14addb6b0f01fc8202bc15c04c317443ca5 (patch) | |
| tree | b85e577171259a0097a0d6f7ebbb9656d7a1d8af /webAO | |
| parent | ba8ec61733a6d582f939fffbe04793d31ec2d12e (diff) | |
| parent | 2fa960d6e7400c31ef6cbf881421e8fba5e48c81 (diff) | |
Merge branch 'master' into arup
Diffstat (limited to 'webAO')
| -rw-r--r-- | webAO/client.css | 2 | ||||
| -rw-r--r-- | webAO/client.js | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/webAO/client.css b/webAO/client.css index c91d643..6cea13a 100644 --- a/webAO/client.css +++ b/webAO/client.css @@ -1,5 +1,5 @@ body { - font-family: "Ace Attorney", "メイリオ", Meiryo, Hiragino Kaku Gothic Pro, "ヒラギノ角ゴ Pro W3", Osaka, "MS Gothic", "ＭＳ Ｐゴシック", Tahoma, Sans; + font-family: "Ace Attorney", "Hiragino Kaku Gothic Pro", "ヒラギノ角ゴ Pro W3", "Osaka", "MS Gothic", "ＭＳ Ｐゴシック", "Tahoma", Sans; } img { diff --git a/webAO/client.js b/webAO/client.js index 493598d..dd788b8 100644 --- a/webAO/client.js +++ b/webAO/client.js @@ -188,7 +188,7 @@ class Client extends EventEmitter { * @param {string} message the message to send */ sendOOC(message) { - setCookie("OOC_name",escapeChat(encodeChat(document.getElementById("OOC_name").value))); + setCookie("OOC_name",document.getElementById("OOC_name").value); this.serv.send(`CT#${escapeChat(encodeChat(document.getElementById("OOC_name").value))}#${escapeChat(encodeChat(message))}#%`); } @@ -354,7 +354,8 @@ class Client extends EventEmitter { * @param {number} character the character ID */ sendCharacter(character) { - this.serv.send(`CC#${this.playerID}#${character}#web#%`); + if (this.chars[character].name) + this.serv.send(`CC#${this.playerID}#${character}#web#%`); } /** @@ -572,9 +573,9 @@ class Client extends EventEmitter { } const mute_select = document.getElementById("mute_select"); - mute_select.add(new Option(escape(chargs[0]), charid)); + mute_select.add(new Option(safe_tags(chargs[0]), charid)); const pair_select = document.getElementById("pair_select"); - pair_select.add(new Option(escape(chargs[0]), charid)); + pair_select.add(new Option(safe_tags(chargs[0]), charid)); // sometimes ini files lack important settings const default_options = { @@ -1342,6 +1343,7 @@ class Viewport { this.chatmsg.startpreanim = true; } + // TODO: preanims sometimes play when they're not supposed to if (this.textTimer >= this.shoutTimer && this.chatmsg.startpreanim) { // Effect stuff if (this.chatmsg.flash === "2") { @@ -1656,7 +1658,7 @@ export function mutelist_click(_event) { // TODO: i don't feel like writing this rn } -window.musiclist_click = mutelist_click; +window.mutelist_click = mutelist_click; /** * Triggered when the showname checkboc is clicked |