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.vue | |
| 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.vue')
| -rw-r--r-- | src/components/emoji_input/emoji_input.vue | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue index 7d95ab7e..81b81913 100644 --- a/src/components/emoji_input/emoji_input.vue +++ b/src/components/emoji_input/emoji_input.vue @@ -50,7 +50,21 @@ <span v-else>{{ suggestion.replacement }}</span> </span> <div class="label"> - <span class="displayText">{{ suggestion.displayText }}</span> + <span + v-if="suggestion.user" + class="displayText" + > + {{ suggestion.displayText }}<UnicodeDomainIndicator + :user="suggestion.user" + :at="false" + /> + </span> + <span + v-if="!suggestion.user" + class="displayText" + > + {{ suggestion.displayText }} + </span> <span class="detailText">{{ suggestion.detailText }}</span> </div> </div> |