Fix displaying remote emojis

This commit is contained in:
Angelina Filippova 2020-06-25 01:36:08 +03:00
parent bac50fe62d
commit ab77704c97
2 changed files with 13 additions and 10 deletions

View file

@ -34,15 +34,18 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-collapse v-model="showPackContent" class="contents-collapse"> <el-collapse v-model="showPackContent" class="contents-collapse">
<el-collapse-item v-if="pack.files.length > 0" :title=" $t('emoji.manageEmoji')" name="manageEmoji" class="no-background"> <el-collapse-item :title=" $t('emoji.manageEmoji')" name="manageEmoji" class="no-background">
<single-emoji-editor <div v-if="pack.files && Object.keys(pack.files).length > 0">
v-for="[shortcode, file] in pack.files" <single-emoji-editor
:key="shortcode" v-for="(file, shortcode) in pack.files"
:host="host" :key="shortcode"
:pack-name="name" :host="host"
:shortcode="shortcode" :pack-name="name"
:file="file" :shortcode="shortcode"
:is-local="isLocal" /> :file="file"
:is-local="isLocal" />
</div>
<span v-else class="expl">{{ $t('emoji.emptyPack') }}</span>
</el-collapse-item> </el-collapse-item>
<el-collapse-item :title=" $t('emoji.downloadPack')" name="downloadPack" class="no-background"> <el-collapse-item :title=" $t('emoji.downloadPack')" name="downloadPack" class="no-background">
<p> <p>

View file

@ -103,7 +103,7 @@ export default {
return this.$store.state.emojiPacks.localPacks return this.$store.state.emojiPacks.localPacks
}, },
remoteInstance() { remoteInstance() {
return new URL(this.$store.state.emojiPacks.remoteInstance).host return this.$store.state.emojiPacks.remoteInstance
} }
}, },
methods: { methods: {