review changes
This commit is contained in:
parent
4e04079739
commit
6afff4f8c2
4 changed files with 6 additions and 14 deletions
|
@ -7,8 +7,8 @@
|
|||
:class="{ 'picked-reaction': reactedWith(reaction.emoji) }"
|
||||
@click="emojiOnClick(reaction.emoji, $event)"
|
||||
>
|
||||
<span>{{ reaction.count }}</span>
|
||||
<span>{{ reaction.emoji }}</span>
|
||||
<span>{{ reaction.count }}</span>
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -31,10 +31,10 @@
|
|||
align-items: center;
|
||||
justify-content: center;
|
||||
box-sizing: border-box;
|
||||
:first-child {
|
||||
&:first-child {
|
||||
margin-right: 0.25em;
|
||||
}
|
||||
:last-child {
|
||||
&:last-child {
|
||||
width: 1.5em;
|
||||
}
|
||||
&:focus {
|
||||
|
|
|
@ -4,7 +4,6 @@ const ReactButton = {
|
|||
props: ['status', 'loggedIn'],
|
||||
data () {
|
||||
return {
|
||||
animated: false,
|
||||
showTooltip: false,
|
||||
filterWord: '',
|
||||
popperOptions: {
|
||||
|
@ -29,7 +28,7 @@ const ReactButton = {
|
|||
},
|
||||
computed: {
|
||||
commonEmojis () {
|
||||
return ['💖', '😠', '👀', '😂', '🔥']
|
||||
return ['❤️', '😠', '👀', '😂', '🔥']
|
||||
},
|
||||
emojis () {
|
||||
if (this.filterWord !== '') {
|
||||
|
@ -37,12 +36,6 @@ const ReactButton = {
|
|||
}
|
||||
return this.$store.state.instance.emoji || []
|
||||
},
|
||||
classes () {
|
||||
return {
|
||||
'icon-smile': true,
|
||||
'animate-spin': this.animated
|
||||
}
|
||||
},
|
||||
...mapGetters(['mergedConfig'])
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,8 +40,7 @@
|
|||
@click.prevent="openReactionSelect"
|
||||
>
|
||||
<i
|
||||
:class="classes"
|
||||
class="button-icon add-reaction-button"
|
||||
class="icon-smile button-icon add-reaction-button"
|
||||
:title="$t('tool_tip.add_reaction')"
|
||||
/>
|
||||
</div>
|
||||
|
|
|
@ -233,7 +233,6 @@ export const parseStatus = (data) => {
|
|||
output.statusnet_html = addEmojis(data.content, data.emojis)
|
||||
|
||||
output.tags = data.tags
|
||||
output.emoji_reactions = data.pleroma.emoji_reactions
|
||||
|
||||
if (data.pleroma) {
|
||||
const { pleroma } = data
|
||||
|
@ -243,6 +242,7 @@ export const parseStatus = (data) => {
|
|||
output.is_local = pleroma.local
|
||||
output.in_reply_to_screen_name = data.pleroma.in_reply_to_account_acct
|
||||
output.thread_muted = pleroma.thread_muted
|
||||
output.emoji_reactions = pleroma.emoji_reactions
|
||||
} else {
|
||||
output.text = data.content
|
||||
output.summary = data.spoiler_text
|
||||
|
|
Loading…
Reference in a new issue