diff options
| author | lain <lain@soykaf.club> | 2020-02-11 12:24:51 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-02-11 12:24:51 +0000 |
| commit | 96dc297babd5797b9307af8676719c2eb8cd80e2 (patch) | |
| tree | 84fe716e36eebe46c1ab5a2269eb4e05f00f940c /src/components/react_button | |
| parent | 17b6d8ddb8a9a1637fd88e017170b973b97381da (diff) | |
| parent | f6b482be515ea4f0281050f71296ffe0ec2ab305 (diff) | |
Merge branch 'feat/emoji-reaction-fixes-improvements' into 'develop'
Emoji Reactions - fixes and improvements
See merge request pleroma/pleroma-fe!1051
Diffstat (limited to 'src/components/react_button')
| -rw-r--r-- | src/components/react_button/react_button.js | 7 | ||||
| -rw-r--r-- | src/components/react_button/react_button.vue | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js index 6fb2a780..a6cf5b94 100644 --- a/src/components/react_button/react_button.js +++ b/src/components/react_button/react_button.js @@ -22,7 +22,12 @@ const ReactButton = { this.showTooltip = false }, addReaction (event, emoji) { - this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji }) + const existingReaction = this.status.emoji_reactions.find(r => r.name === emoji) + if (existingReaction && existingReaction.me) { + this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji }) + } else { + this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji }) + } this.closeReactionSelect() } }, diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue index c925dd71..fb43ebaf 100644 --- a/src/components/react_button/react_button.vue +++ b/src/components/react_button/react_button.vue @@ -54,6 +54,10 @@ .reaction-picker-filter { padding: 0.5em; + display: flex; + input { + flex: 1; + } } .reaction-picker-divider { |