diff --git a/bbcode/Editor.vue b/bbcode/Editor.vue index ebe6949..c8d6313 100644 --- a/bbcode/Editor.vue +++ b/bbcode/Editor.vue @@ -21,7 +21,7 @@ -
+
@@ -66,7 +66,7 @@ previewResult = ''; text = this.value !== undefined ? this.value : ''; element!: HTMLTextAreaElement; - sizer!: HTMLElement; + sizer!: HTMLTextAreaElement; maxHeight!: number; minHeight!: number; showToolbar = false; @@ -99,7 +99,7 @@ this.undoStack.unshift(this.text); } }, 500); - this.sizer = this.$refs['sizer']; + this.sizer = this.$refs['sizer']; this.sizer.style.cssText = styles.cssText; this.sizer.style.height = '0'; this.sizer.style.overflow = 'hidden'; @@ -240,7 +240,7 @@ this.sizer.style.fontSize = this.element.style.fontSize; this.sizer.style.lineHeight = this.element.style.lineHeight; this.sizer.style.width = `${this.element.offsetWidth}px`; - this.sizer.textContent = this.element.value; + this.sizer.value = this.element.value; this.element.style.height = `${Math.max(Math.min(this.sizer.scrollHeight, this.maxHeight), this.minHeight)}px`; this.sizer.style.width = '0'; } diff --git a/chat/Chat.vue b/chat/Chat.vue index 3c2d53a..0fe2db7 100644 --- a/chat/Chat.vue +++ b/chat/Chat.vue @@ -146,8 +146,10 @@ document.title = (hasNew ? '💬 ' : '') + l(core.connection.isOpen ? 'title.connected' : 'title', core.connection.character); }); core.connection.onError((e) => { - this.error = errorToString(e); - this.connecting = false; + if((e).request !== undefined) {//catch axios network errors + this.error = l('login.connectError', errorToString(e)); + this.connecting = false; + } else throw e; }); } @@ -158,12 +160,7 @@ connect(): void { this.connecting = true; - core.connection.connect(this.selectedCharacter).catch((e: Error) => { - if((e).request !== undefined) {//catch axios network errors - this.error = l('login.connectError', e.message); - this.connecting = false; - } else throw e; - }); + core.connection.connect(this.selectedCharacter); } } \ No newline at end of file diff --git a/chat/ChatView.vue b/chat/ChatView.vue index 30a515b..6ba6a22 100644 --- a/chat/ChatView.vue +++ b/chat/ChatView.vue @@ -158,17 +158,17 @@ clearTimeout(idleTimer); idleTimer = undefined; } - window.setTimeout(() => { - if(idleStatus !== undefined) { - core.connection.send('STA', idleStatus); - idleStatus = undefined; - } - }, Math.max(lastUpdate + 5 /*core.connection.vars.sta_flood*/ * 1000 + 1000 - Date.now(), 0)); + if(idleStatus !== undefined) { + const status = idleStatus; + window.setTimeout(() => core.connection.send('STA', status), + Math.max(lastUpdate + 5 /*core.connection.vars.sta_flood*/ * 1000 + 1000 - Date.now(), 0)); + idleStatus = undefined; + } }); window.addEventListener('blur', () => { core.notifications.isInBackground = true; if(idleTimer !== undefined) clearTimeout(idleTimer); - if(core.state.settings.idleTimer !== 0) + if(core.state.settings.idleTimer > 0) idleTimer = window.setTimeout(() => { lastUpdate = Date.now(); idleStatus = {status: ownCharacter.status, statusmsg: ownCharacter.statusText}; diff --git a/chat/CommandHelp.vue b/chat/CommandHelp.vue index 4e93868..85cdbb6 100644 --- a/chat/CommandHelp.vue +++ b/chat/CommandHelp.vue @@ -15,7 +15,12 @@
{{command.permission}}
- +
+
+
+
+ +
diff --git a/chat/ConversationView.vue b/chat/ConversationView.vue index 8cf3dc7..ddc8e12 100644 --- a/chat/ConversationView.vue +++ b/chat/ConversationView.vue @@ -48,7 +48,7 @@
+ :style="'display:' + (descriptionExpanded ? 'block' : 'none')" class="bg-solid-text border-bottom">
@@ -64,7 +64,7 @@ -
{ const editor = this.$refs['textBox']; if(getKey(e) === Keys.Tab) { + if(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey) return; e.preventDefault(); if(this.conversation.enteredText.length === 0 || this.isConsoleTab) return; if(this.tabOptions === undefined) { diff --git a/chat/Logs.vue b/chat/Logs.vue index f0b0760..0378f3d 100644 --- a/chat/Logs.vue +++ b/chat/Logs.vue @@ -1,7 +1,12 @@