From 67f58b52171fed1a415acb584ff538b142199606 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 4 May 2021 23:12:36 +0900
Subject: [PATCH] fix bug
---
src/client/components/date-separated-list.vue | 4 ++++
src/client/components/global/ad.vue | 7 ++++---
src/client/pages/instance/ads.vue | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/client/components/date-separated-list.vue b/src/client/components/date-separated-list.vue
index d458a0eeb8..c7ca67582a 100644
--- a/src/client/components/date-separated-list.vue
+++ b/src/client/components/date-separated-list.vue
@@ -105,6 +105,10 @@ export default defineComponent({
<style lang="scss">
.sqadhkmv {
+ > *:empty {
+ display: none;
+ }
+
> *:not(:last-child) {
margin-bottom: var(--margin);
}
diff --git a/src/client/components/global/ad.vue b/src/client/components/global/ad.vue
index 00592e4ca2..53e6e8b8bb 100644
--- a/src/client/components/global/ad.vue
+++ b/src/client/components/global/ad.vue
@@ -14,6 +14,7 @@
</div>
</div>
</div>
+<div v-else></div>
</template>
<script lang="ts">
@@ -32,7 +33,7 @@ export default defineComponent({
type: String,
required: true
},
- ad: {
+ specify: {
type: Object,
required: false
},
@@ -46,8 +47,8 @@ export default defineComponent({
let ad = null;
- if (props.ad) {
- ad = props.ad;
+ if (props.specify) {
+ ad = props.specify;
} else {
let ads = instance.ads.filter(ad => ad.place === props.prefer);
diff --git a/src/client/pages/instance/ads.vue b/src/client/pages/instance/ads.vue
index 4297e56c37..ee7114f91c 100644
--- a/src/client/pages/instance/ads.vue
+++ b/src/client/pages/instance/ads.vue
@@ -3,7 +3,7 @@
<MkButton @click="add()" primary style="margin: 0 auto 16px auto;"><i class="fas fa-plus"></i> {{ $ts.add }}</MkButton>
<section class="_card _gap ads" v-for="ad in ads">
<div class="_content ad">
- <MkAd v-if="ad.url" :ad="ad"/>
+ <MkAd v-if="ad.url" :specify="ad"/>
<MkInput v-model:value="ad.url" type="url">
<span>URL</span>
</MkInput>