From ab77704c97204b98fbf5479b35381e4a16215e63 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Thu, 25 Jun 2020 01:36:08 +0300
Subject: [PATCH] Fix displaying remote emojis
---
.../emojiPacks/components/RemoteEmojiPack.vue | 21 +++++++++++--------
.../components/SingleEmojiEditor.vue | 2 +-
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/views/emojiPacks/components/RemoteEmojiPack.vue b/src/views/emojiPacks/components/RemoteEmojiPack.vue
index 532095df..3dcca6c0 100644
--- a/src/views/emojiPacks/components/RemoteEmojiPack.vue
+++ b/src/views/emojiPacks/components/RemoteEmojiPack.vue
@@ -34,15 +34,18 @@
</el-form-item>
</el-form>
<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">
- <single-emoji-editor
- v-for="[shortcode, file] in pack.files"
- :key="shortcode"
- :host="host"
- :pack-name="name"
- :shortcode="shortcode"
- :file="file"
- :is-local="isLocal" />
+ <el-collapse-item :title=" $t('emoji.manageEmoji')" name="manageEmoji" class="no-background">
+ <div v-if="pack.files && Object.keys(pack.files).length > 0">
+ <single-emoji-editor
+ v-for="(file, shortcode) in pack.files"
+ :key="shortcode"
+ :host="host"
+ :pack-name="name"
+ :shortcode="shortcode"
+ :file="file"
+ :is-local="isLocal" />
+ </div>
+ <span v-else class="expl">{{ $t('emoji.emptyPack') }}</span>
</el-collapse-item>
<el-collapse-item :title=" $t('emoji.downloadPack')" name="downloadPack" class="no-background">
<p>
diff --git a/src/views/emojiPacks/components/SingleEmojiEditor.vue b/src/views/emojiPacks/components/SingleEmojiEditor.vue
index bb82a298..9a773f67 100644
--- a/src/views/emojiPacks/components/SingleEmojiEditor.vue
+++ b/src/views/emojiPacks/components/SingleEmojiEditor.vue
@@ -103,7 +103,7 @@ export default {
return this.$store.state.emojiPacks.localPacks
},
remoteInstance() {
- return new URL(this.$store.state.emojiPacks.remoteInstance).host
+ return this.$store.state.emojiPacks.remoteInstance
}
},
methods: {
--
GitLab