diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-12-30 08:41:26 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-12-30 08:41:26 +0900 |
| commit | 198123ff5fc90ade771fbc41e67a3a7ac6c7e433 (patch) | |
| tree | f68ca8fde1465116c189b8c6a57c65a6988ad380 /packages/frontend/src | |
| parent | fix 912791b3ab (diff) | |
| parent | fix(client): use MkEmoji for custom emoji in MkEmojiPicker (diff) | |
| download | misskey-198123ff5fc90ade771fbc41e67a3a7ac6c7e433.tar.gz misskey-198123ff5fc90ade771fbc41e67a3a7ac6c7e433.tar.bz2 misskey-198123ff5fc90ade771fbc41e67a3a7ac6c7e433.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/frontend/src')
| -rw-r--r-- | packages/frontend/src/components/MkEmojiPicker.vue | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue index 814f71168a..e9e265a916 100644 --- a/packages/frontend/src/components/MkEmojiPicker.vue +++ b/packages/frontend/src/components/MkEmojiPicker.vue @@ -12,8 +12,7 @@ tabindex="0" @click="chosen(emoji, $event)" > - <!--<MkEmoji v-if="emoji.char != null" :emoji="emoji.char"/>--> - <img class="emoji" :src="disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url"/> + <MkEmoji class="emoji" :emoji="`:${emoji.name}:`" /> </button> </div> <div v-if="searchResultUnicode.length > 0" class="body"> |