review changes

This commit is contained in:
Shpuld Shpuldson 2020-01-28 17:09:25 +02:00
parent 4e04079739
commit 6afff4f8c2
4 changed files with 6 additions and 14 deletions

View file

@ -7,8 +7,8 @@
:class="{ 'picked-reaction': reactedWith(reaction.emoji) }" :class="{ 'picked-reaction': reactedWith(reaction.emoji) }"
@click="emojiOnClick(reaction.emoji, $event)" @click="emojiOnClick(reaction.emoji, $event)"
> >
<span>{{ reaction.count }}</span>
<span>{{ reaction.emoji }}</span> <span>{{ reaction.emoji }}</span>
<span>{{ reaction.count }}</span>
</button> </button>
</div> </div>
</template> </template>
@ -31,10 +31,10 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
box-sizing: border-box; box-sizing: border-box;
:first-child { &:first-child {
margin-right: 0.25em; margin-right: 0.25em;
} }
:last-child { &:last-child {
width: 1.5em; width: 1.5em;
} }
&:focus { &:focus {

View file

@ -4,7 +4,6 @@ const ReactButton = {
props: ['status', 'loggedIn'], props: ['status', 'loggedIn'],
data () { data () {
return { return {
animated: false,
showTooltip: false, showTooltip: false,
filterWord: '', filterWord: '',
popperOptions: { popperOptions: {
@ -29,7 +28,7 @@ const ReactButton = {
}, },
computed: { computed: {
commonEmojis () { commonEmojis () {
return ['💖', '😠', '👀', '😂', '🔥'] return ['❤️', '😠', '👀', '😂', '🔥']
}, },
emojis () { emojis () {
if (this.filterWord !== '') { if (this.filterWord !== '') {
@ -37,12 +36,6 @@ const ReactButton = {
} }
return this.$store.state.instance.emoji || [] return this.$store.state.instance.emoji || []
}, },
classes () {
return {
'icon-smile': true,
'animate-spin': this.animated
}
},
...mapGetters(['mergedConfig']) ...mapGetters(['mergedConfig'])
} }
} }

View file

@ -40,8 +40,7 @@
@click.prevent="openReactionSelect" @click.prevent="openReactionSelect"
> >
<i <i
:class="classes" class="icon-smile button-icon add-reaction-button"
class="button-icon add-reaction-button"
:title="$t('tool_tip.add_reaction')" :title="$t('tool_tip.add_reaction')"
/> />
</div> </div>

View file

@ -233,7 +233,6 @@ export const parseStatus = (data) => {
output.statusnet_html = addEmojis(data.content, data.emojis) output.statusnet_html = addEmojis(data.content, data.emojis)
output.tags = data.tags output.tags = data.tags
output.emoji_reactions = data.pleroma.emoji_reactions
if (data.pleroma) { if (data.pleroma) {
const { pleroma } = data const { pleroma } = data
@ -243,6 +242,7 @@ export const parseStatus = (data) => {
output.is_local = pleroma.local output.is_local = pleroma.local
output.in_reply_to_screen_name = data.pleroma.in_reply_to_account_acct output.in_reply_to_screen_name = data.pleroma.in_reply_to_account_acct
output.thread_muted = pleroma.thread_muted output.thread_muted = pleroma.thread_muted
output.emoji_reactions = pleroma.emoji_reactions
} else { } else {
output.text = data.content output.text = data.content
output.summary = data.spoiler_text output.summary = data.spoiler_text