Merge branch 'hj/2.7.1-fixes' into shigusegubu-themes3
This commit is contained in:
commit
e4fa337bb4
2 changed files with 10 additions and 15 deletions
|
@ -3,8 +3,7 @@
|
||||||
v-if="!hideStatus"
|
v-if="!hideStatus"
|
||||||
ref="root"
|
ref="root"
|
||||||
class="Status"
|
class="Status"
|
||||||
:class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }, userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
|
:class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }]"
|
||||||
:style="[ userStyle ]"
|
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
v-if="error"
|
v-if="error"
|
||||||
|
@ -121,6 +120,8 @@
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-if="!deleted"
|
v-if="!deleted"
|
||||||
|
:class="[userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
|
||||||
|
:style="[ userStyle ]"
|
||||||
class="status-container"
|
class="status-container"
|
||||||
:data-tags="tags"
|
:data-tags="tags"
|
||||||
>
|
>
|
||||||
|
|
|
@ -250,21 +250,15 @@ const instance = {
|
||||||
}, {})
|
}, {})
|
||||||
},
|
},
|
||||||
standardEmojiList (state) {
|
standardEmojiList (state) {
|
||||||
if (!state.standardEmojiList) {
|
return SORTED_EMOJI_GROUP_IDS
|
||||||
state.standardEmojiList = SORTED_EMOJI_GROUP_IDS
|
.map(groupId => (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations)))
|
||||||
.map(groupId => (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations)))
|
.reduce((a, b) => a.concat(b), [])
|
||||||
.reduce((a, b) => a.concat(b), [])
|
|
||||||
}
|
|
||||||
return state.standardEmojiList
|
|
||||||
},
|
},
|
||||||
standardEmojiGroupList (state) {
|
standardEmojiGroupList (state) {
|
||||||
if (!state.standardEmojiGroupList) {
|
return SORTED_EMOJI_GROUP_IDS.map(groupId => ({
|
||||||
state.standardEmojiGroupList = SORTED_EMOJI_GROUP_IDS.map(groupId => ({
|
id: groupId,
|
||||||
id: groupId,
|
emojis: (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations))
|
||||||
emojis: (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations))
|
}))
|
||||||
}))
|
|
||||||
}
|
|
||||||
return state.standardEmojiGroupList
|
|
||||||
},
|
},
|
||||||
instanceDomain (state) {
|
instanceDomain (state) {
|
||||||
return new URL(state.server).hostname
|
return new URL(state.server).hostname
|
||||||
|
|
Loading…
Add table
Reference in a new issue