hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'tusooa/1366-emoji-count-button' into 'develop'

Browse source 
Switch from class hack to normalButton attr for emoji count popover

Closes #1366

See merge request pleroma/pleroma-fe!2099
This commit is contained in:
HJ 2025-03-23 12:39:54 +00:00
commit b8c84094b8
3 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/emoji-count-button.fix Normal file
View file

@ -0,0 +1 @@
Switch from class hack to normalButton attr for emoji count popover

2
src/components/emoji_reactions/emoji_reactions.js
View file

@ -84,8 +84,6 @@ const EmojiReactions = {
counterTriggerAttrs (reaction) { counterTriggerAttrs (reaction) {
return { return {
class: [ class: [
'btn',
'button-default',
'emoji-reaction-count-button', 'emoji-reaction-count-button',
{ {
'-picked-reaction': this.reactedWith(reaction.name), '-picked-reaction': this.reactedWith(reaction.name),

1
src/components/emoji_reactions/emoji_reactions.vue
View file

@ -52,6 +52,7 @@
<UserListPopover <UserListPopover
:users="accountsForEmoji[reaction.name]" :users="accountsForEmoji[reaction.name]"
class="emoji-reaction-popover" class="emoji-reaction-popover"
:normal-button="true"
:trigger-attrs="counterTriggerAttrs(reaction)" :trigger-attrs="counterTriggerAttrs(reaction)"
@show="fetchEmojiReactionsByIfMissing()" @show="fetchEmojiReactionsByIfMissing()"
> >