diff options
| author | rinsuki <428rinsuki+git@gmail.com> | 2018-03-26 21:54:38 +0900 |
|---|---|---|
| committer | rinsuki <428rinsuki+git@gmail.com> | 2018-03-26 21:54:38 +0900 |
| commit | b1f8fe7752fd14338960de242ebf52aa1fe2a97b (patch) | |
| tree | 7427e56f84d8ef21b7589d06140114c7f563af17 /src/web/app/common | |
| parent | Merge branch 'master' of https://github.com/syuilo/misskey (diff) | |
| download | sharkey-b1f8fe7752fd14338960de242ebf52aa1fe2a97b.tar.gz sharkey-b1f8fe7752fd14338960de242ebf52aa1fe2a97b.tar.bz2 sharkey-b1f8fe7752fd14338960de242ebf52aa1fe2a97b.zip | |
implement mk-media-video
Diffstat (limited to 'src/web/app/common')
| -rw-r--r-- | src/web/app/common/views/components/media-list.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/web/app/common/views/components/media-list.vue b/src/web/app/common/views/components/media-list.vue index d0da584a40..64172ad0b4 100644 --- a/src/web/app/common/views/components/media-list.vue +++ b/src/web/app/common/views/components/media-list.vue @@ -1,7 +1,8 @@ <template> <div class="mk-media-list" :data-count="mediaList.length"> <template v-for="media in mediaList"> - <mk-media-image :image="media" :key="media.id"/> + <mk-media-video :video="media" :key="media.id" v-if="media.type.startsWith('video')" :inline-playable="mediaList.length === 1"/> + <mk-media-image :image="media" :key="media.id" v-else /> </template> </div> </template> |