summaryrefslogtreecommitdiff
path: root/src/client/app
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-09-16 04:26:01 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-09-16 04:26:01 +0900
commit8d24fcba6ab18ef03127f8d95eb87ce45bb005d7 (patch)
treefc0b4cd1a9f1c9567ddd1c8ee050dbf1b6c627b5 /src/client/app
parentバグ修正やデザイン調整など (diff)
downloadmisskey-8d24fcba6ab18ef03127f8d95eb87ce45bb005d7.tar.gz
misskey-8d24fcba6ab18ef03127f8d95eb87ce45bb005d7.tar.bz2
misskey-8d24fcba6ab18ef03127f8d95eb87ce45bb005d7.zip
:v:
Diffstat (limited to 'src/client/app')
-rw-r--r--src/client/app/common/views/components/index.ts2
-rw-r--r--src/client/app/common/views/components/media-list.vue6
2 files changed, 5 insertions, 3 deletions
diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts
index 21af4ec846..6f8152cea2 100644
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@@ -20,7 +20,6 @@ import reactionsViewer from './reactions-viewer.vue';
import time from './time.vue';
import timer from './timer.vue';
import mediaList from './media-list.vue';
-import mediaBanner from './media-banner.vue';
import uploader from './uploader.vue';
import specialMessage from './special-message.vue';
import streamIndicator from './stream-indicator.vue';
@@ -64,7 +63,6 @@ Vue.component('mk-reactions-viewer', reactionsViewer);
Vue.component('mk-time', time);
Vue.component('mk-timer', timer);
Vue.component('mk-media-list', mediaList);
-Vue.component('mk-media-banner', mediaBanner);
Vue.component('mk-uploader', uploader);
Vue.component('mk-special-message', specialMessage);
Vue.component('mk-stream-indicator', streamIndicator);
diff --git a/src/client/app/common/views/components/media-list.vue b/src/client/app/common/views/components/media-list.vue
index b4b7d8f87f..d83d6f85cd 100644
--- a/src/client/app/common/views/components/media-list.vue
+++ b/src/client/app/common/views/components/media-list.vue
@@ -1,7 +1,7 @@
<template>
<div class="mk-media-list">
<template v-for="media in mediaList.filter(media => !previewable(media))">
- <mk-media-banner :media="media" :key="media.id"/>
+ <x-banner :media="media" :key="media.id"/>
</template>
<div v-if="mediaList.filter(media => previewable(media)).length > 0" class="gird-container">
<div :data-count="mediaList.filter(media => previewable(media)).length" ref="grid">
@@ -16,8 +16,12 @@
<script lang="ts">
import Vue from 'vue';
+import XBanner from './media-banner.vue';
export default Vue.extend({
+ components: {
+ XBanner
+ },
props: {
mediaList: {
required: true