summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2018-09-04 21:06:02 +0900
committertamaina <tamaina@hotmail.co.jp>2018-09-04 21:06:02 +0900
commit8bcfa97349b73b3c9759cad7b1678a02bc36e2f9 (patch)
treec7d638e3f1e9e7c550aa1e373a9383a9043f8dfc /src/client
parentwip (diff)
downloadmisskey-8bcfa97349b73b3c9759cad7b1678a02bc36e2f9.tar.gz
misskey-8bcfa97349b73b3c9759cad7b1678a02bc36e2f9.tar.bz2
misskey-8bcfa97349b73b3c9759cad7b1678a02bc36e2f9.zip
wip
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/views/components/media-list.vue2
-rw-r--r--src/client/app/desktop/views/components/index.ts2
-rw-r--r--src/client/app/desktop/views/components/media-audio.vue3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/client/app/common/views/components/media-list.vue b/src/client/app/common/views/components/media-list.vue
index c531f9ac91..4408ba2792 100644
--- a/src/client/app/common/views/components/media-list.vue
+++ b/src/client/app/common/views/components/media-list.vue
@@ -3,7 +3,7 @@
<div :data-count="mediaList.length" ref="grid">
<template v-for="media in mediaList">
<mk-media-video :video="media" :key="media.id" v-if="media.type.startsWith('video')" :inline-playable="mediaList.length === 1"/>
- <mk-media-audio :video="media" :key="media.id" v-if="media.type.startsWith('audio')" :inline-playable="mediaList.length === 1"/>
+ <mk-media-audio :audio="media" :key="media.id" v-if="media.type.startsWith('audio')" :inline-playable="mediaList.length === 1"/>
<mk-media-image :image="media" :key="media.id" v-else :raw="raw"/>
</template>
</div>
diff --git a/src/client/app/desktop/views/components/index.ts b/src/client/app/desktop/views/components/index.ts
index 7b7a38afa2..159ead4983 100644
--- a/src/client/app/desktop/views/components/index.ts
+++ b/src/client/app/desktop/views/components/index.ts
@@ -13,6 +13,7 @@ import ellipsisIcon from './ellipsis-icon.vue';
import mediaImage from './media-image.vue';
import mediaImageDialog from './media-image-dialog.vue';
import mediaVideo from './media-video.vue';
+import mediaAudio from './media-audio.vue';
import notifications from './notifications.vue';
import noteForm from './post-form.vue';
import renoteForm from './renote-form.vue';
@@ -43,6 +44,7 @@ Vue.component('mk-ellipsis-icon', ellipsisIcon);
Vue.component('mk-media-image', mediaImage);
Vue.component('mk-media-image-dialog', mediaImageDialog);
Vue.component('mk-media-video', mediaVideo);
+Vue.component('mk-media-audio', mediaAudio);
Vue.component('mk-notifications', notifications);
Vue.component('mk-post-form', noteForm);
Vue.component('mk-renote-form', renoteForm);
diff --git a/src/client/app/desktop/views/components/media-audio.vue b/src/client/app/desktop/views/components/media-audio.vue
index 4a0c26fb9e..5d41947b17 100644
--- a/src/client/app/desktop/views/components/media-audio.vue
+++ b/src/client/app/desktop/views/components/media-audio.vue
@@ -10,8 +10,7 @@
:src="audio.url"
:title="audio.name"
controls
- ref="audio"
- v-if="inlinePlayable" />
+ ref="audio" />
</div>
</template>