diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-21 17:59:29 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-21 17:59:29 +0900 |
| commit | f00ceedae48e7969ca9e80f0af2280bf060421ec (patch) | |
| tree | 620bb82f6a2ce41f3b3b3d187242bd5bc8e35171 /src/client/scripts/autocomplete.ts | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.89.0 (diff) | |
| download | misskey-f00ceedae48e7969ca9e80f0af2280bf060421ec.tar.gz misskey-f00ceedae48e7969ca9e80f0af2280bf060421ec.tar.bz2 misskey-f00ceedae48e7969ca9e80f0af2280bf060421ec.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/client/scripts/autocomplete.ts')
| -rw-r--r-- | src/client/scripts/autocomplete.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/scripts/autocomplete.ts b/src/client/scripts/autocomplete.ts index 99c54c69c5..924d6a62ee 100644 --- a/src/client/scripts/autocomplete.ts +++ b/src/client/scripts/autocomplete.ts @@ -65,7 +65,7 @@ export class Autocomplete { */ private onInput() { const caretPos = this.textarea.selectionStart; - const text = this.text.substr(0, caretPos).split('\n').pop(); + const text = this.text.substr(0, caretPos).split('\n').pop()!; const mentionIndex = text.lastIndexOf('@'); const hashtagIndex = text.lastIndexOf('#'); @@ -83,7 +83,7 @@ export class Autocomplete { const isMention = mentionIndex != -1; const isHashtag = hashtagIndex != -1; - const isEmoji = emojiIndex != -1; + const isEmoji = emojiIndex != -1 && text.split(/:[a-z0-9_+\-]+:/).pop()!.includes(':'); let opened = false; |