diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-29 23:03:23 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-08-29 23:03:23 +0000 |
| commit | 3b6c31f3b3d2326ffbe258c826f6dbd3f5374cf2 (patch) | |
| tree | b65d8ced59250c758ffa7aeb313c4ae783ee0a9f /src/components/emoji_input/emoji_input.js | |
| parent | e812d5ea3c97fdac0ed6b23817ae144cf96bb300 (diff) | |
| parent | 0a79a747730bb4a10eb2544412dab68a10602240 (diff) | |
Merge branch 'from/develop/tusooa/1189-mention-uri' into 'develop'
Use dedicated indicator for non-ascii domain names
Closes #1189
See merge request pleroma/pleroma-fe!1632
Diffstat (limited to 'src/components/emoji_input/emoji_input.js')
| -rw-r--r-- | src/components/emoji_input/emoji_input.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js index 5ba3907f..b664d6b3 100644 --- a/src/components/emoji_input/emoji_input.js +++ b/src/components/emoji_input/emoji_input.js @@ -1,5 +1,6 @@ import Completion from '../../services/completion/completion.js' import EmojiPicker from '../emoji_picker/emoji_picker.vue' +import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue' import { take } from 'lodash' import { findOffset } from '../../services/offset_finder/offset_finder.service.js' @@ -120,7 +121,8 @@ const EmojiInput = { } }, components: { - EmojiPicker + EmojiPicker, + UnicodeDomainIndicator }, computed: { padEmoji () { |