diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-12-01 11:01:29 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-12-01 11:01:29 +0000 |
| commit | c655699935ce6fd8b5d0a744dafd6403e32277b7 (patch) | |
| tree | b3be8359e328a79d06f0e45b61885c221bd7e080 /src/components/react_button/react_button.vue | |
| parent | 133294dc2aa56927097e7641dec7f15ad9179d80 (diff) | |
| parent | 10e26481420da47c9addeab220b097186bac625a (diff) | |
Merge branch 'feat/react-picker-titles-support-filter-by-emoji' into 'develop'
Fix #1014 add titles in react picker, support filtering by emoji itself
Closes #1014
See merge request pleroma/pleroma-fe!1294
Diffstat (limited to 'src/components/react_button/react_button.vue')
| -rw-r--r-- | src/components/react_button/react_button.vue | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index e508a3e9..b5eb4524 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -22,15 +22,17 @@ v-for="emoji in commonEmojis" :key="emoji" class="emoji-button" + :title="emoji.displayText" @click="addReaction($event, emoji, close)" > - {{ emoji }} + {{ emoji.replacement }} </span> <div class="reaction-picker-divider" /> <span v-for="(emoji, key) in emojis" :key="key" class="emoji-button" + :title="emoji.displayText" @click="addReaction($event, emoji.replacement, close)" > {{ emoji.replacement }} |