From b1f8fe7752fd14338960de242ebf52aa1fe2a97b Mon Sep 17 00:00:00 2001 From: rinsuki <428rinsuki+git@gmail.com> Date: Mon, 26 Mar 2018 21:54:38 +0900 Subject: [PATCH 1/2] implement mk-media-video --- .../common/views/components/media-list.vue | 3 +- src/web/app/desktop/views/components/index.ts | 2 + .../views/components/media-video-dialog.vue | 70 +++++++++++++++++++ .../desktop/views/components/media-video.vue | 67 ++++++++++++++++++ 4 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 src/web/app/desktop/views/components/media-video-dialog.vue create mode 100644 src/web/app/desktop/views/components/media-video.vue 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 @@ diff --git a/src/web/app/desktop/views/components/index.ts b/src/web/app/desktop/views/components/index.ts index 9bca603a53..3798bf6d2d 100644 --- a/src/web/app/desktop/views/components/index.ts +++ b/src/web/app/desktop/views/components/index.ts @@ -13,6 +13,7 @@ import analogClock from './analog-clock.vue'; 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 notifications from './notifications.vue'; import postForm from './post-form.vue'; import repostForm from './repost-form.vue'; @@ -42,6 +43,7 @@ Vue.component('mk-analog-clock', analogClock); 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-notifications', notifications); Vue.component('mk-post-form', postForm); Vue.component('mk-repost-form', repostForm); diff --git a/src/web/app/desktop/views/components/media-video-dialog.vue b/src/web/app/desktop/views/components/media-video-dialog.vue new file mode 100644 index 0000000000..cbf862cd1c --- /dev/null +++ b/src/web/app/desktop/views/components/media-video-dialog.vue @@ -0,0 +1,70 @@ + + + + + diff --git a/src/web/app/desktop/views/components/media-video.vue b/src/web/app/desktop/views/components/media-video.vue new file mode 100644 index 0000000000..4fd955a821 --- /dev/null +++ b/src/web/app/desktop/views/components/media-video.vue @@ -0,0 +1,67 @@ + + + + + From 6d69b0d271d80f1eb1cf44f8fce87cbb46740a85 Mon Sep 17 00:00:00 2001 From: rinsuki <428rinsuki+git@gmail.com> Date: Mon, 26 Mar 2018 22:04:34 +0900 Subject: [PATCH 2/2] mobile version of media-video --- src/web/app/mobile/views/components/index.ts | 2 ++ .../mobile/views/components/media-video.vue | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/web/app/mobile/views/components/media-video.vue diff --git a/src/web/app/mobile/views/components/index.ts b/src/web/app/mobile/views/components/index.ts index 4743f50e0d..fb8f65f47d 100644 --- a/src/web/app/mobile/views/components/index.ts +++ b/src/web/app/mobile/views/components/index.ts @@ -5,6 +5,7 @@ import timeline from './timeline.vue'; import post from './post.vue'; import posts from './posts.vue'; import mediaImage from './media-image.vue'; +import mediaVideo from './media-video.vue'; import drive from './drive.vue'; import postPreview from './post-preview.vue'; import subPostContent from './sub-post-content.vue'; @@ -27,6 +28,7 @@ Vue.component('mk-timeline', timeline); Vue.component('mk-post', post); Vue.component('mk-posts', posts); Vue.component('mk-media-image', mediaImage); +Vue.component('mk-media-video', mediaVideo); Vue.component('mk-drive', drive); Vue.component('mk-post-preview', postPreview); Vue.component('mk-sub-post-content', subPostContent); diff --git a/src/web/app/mobile/views/components/media-video.vue b/src/web/app/mobile/views/components/media-video.vue new file mode 100644 index 0000000000..68cd48587a --- /dev/null +++ b/src/web/app/mobile/views/components/media-video.vue @@ -0,0 +1,36 @@ + + + + +