From 2dba24d0da54b5be3d5435c250af832276ae2c8e Mon Sep 17 00:00:00 2001 From: rinsuki <428rinsuki+git@gmail.com> Date: Mon, 26 Mar 2018 16:56:46 +0900 Subject: [PATCH 1/2] mk-images -> mk-media-list, mk-images-image -> mk-media-image --- src/web/app/common/views/components/index.ts | 4 ++-- .../components/{images.vue => media-list.vue} | 18 +++++++++--------- src/web/app/desktop/views/components/index.ts | 8 ++++---- ...image-dialog.vue => media-image-dialog.vue} | 4 ++-- .../{images-image.vue => media-image.vue} | 8 ++++---- .../views/components/post-detail.sub.vue | 2 +- .../desktop/views/components/post-detail.vue | 2 +- .../desktop/views/components/posts.post.vue | 2 +- .../views/components/sub-post-content.vue | 2 +- src/web/app/mobile/views/components/index.ts | 4 ++-- .../{images-image.vue => media-image.vue} | 4 ++-- .../mobile/views/components/post-detail.vue | 2 +- src/web/app/mobile/views/components/post.vue | 2 +- .../views/components/sub-post-content.vue | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) rename src/web/app/common/views/components/{images.vue => media-list.vue} (82%) rename src/web/app/desktop/views/components/{images-image-dialog.vue => media-image-dialog.vue} (94%) rename src/web/app/desktop/views/components/{images-image.vue => media-image.vue} (89%) rename src/web/app/mobile/views/components/{images-image.vue => media-image.vue} (82%) diff --git a/src/web/app/common/views/components/index.ts b/src/web/app/common/views/components/index.ts index fbf9d22a0b..b58ba37ecb 100644 --- a/src/web/app/common/views/components/index.ts +++ b/src/web/app/common/views/components/index.ts @@ -11,7 +11,7 @@ import reactionIcon from './reaction-icon.vue'; import reactionsViewer from './reactions-viewer.vue'; import time from './time.vue'; import timer from './timer.vue'; -import images from './images.vue'; +import mediaList from './media-list.vue'; import uploader from './uploader.vue'; import specialMessage from './special-message.vue'; import streamIndicator from './stream-indicator.vue'; @@ -36,7 +36,7 @@ Vue.component('mk-reaction-icon', reactionIcon); Vue.component('mk-reactions-viewer', reactionsViewer); Vue.component('mk-time', time); Vue.component('mk-timer', timer); -Vue.component('mk-images', images); +Vue.component('mk-media-list', mediaList); Vue.component('mk-uploader', uploader); Vue.component('mk-special-message', specialMessage); Vue.component('mk-stream-indicator', streamIndicator); diff --git a/src/web/app/common/views/components/images.vue b/src/web/app/common/views/components/media-list.vue similarity index 82% rename from src/web/app/common/views/components/images.vue rename to src/web/app/common/views/components/media-list.vue index dc802a0180..b0e6685082 100644 --- a/src/web/app/common/views/components/images.vue +++ b/src/web/app/common/views/components/media-list.vue @@ -1,6 +1,6 @@ <template> -<div class="mk-images"> - <mk-images-image v-for="image in images" ref="image" :image="image" :key="image.id"/> +<div class="mk-media-list"> + <mk-media-image v-for="media in mediaList" ref="media" :image="media" :key="media.id"/> </div> </template> @@ -8,16 +8,16 @@ import Vue from 'vue'; export default Vue.extend({ - props: ['images'], + props: ['mediaList'], mounted() { - const tags = this.$refs.image as Vue[]; + const tags = this.$refs.media as Vue[]; - if (this.images.length == 1) { + if (this.mediaList.length == 1) { (this.$el.style as any).gridTemplateRows = '1fr'; (tags[0].$el.style as any).gridColumn = '1 / 2'; (tags[0].$el.style as any).gridRow = '1 / 2'; - } else if (this.images.length == 2) { + } else if (this.mediaList.length == 2) { (this.$el.style as any).gridTemplateColumns = '1fr 1fr'; (this.$el.style as any).gridTemplateRows = '1fr'; @@ -25,7 +25,7 @@ export default Vue.extend({ (tags[0].$el.style as any).gridRow = '1 / 2'; (tags[1].$el.style as any).gridColumn = '2 / 3'; (tags[1].$el.style as any).gridRow = '1 / 2'; - } else if (this.images.length == 3) { + } else if (this.mediaList.length == 3) { (this.$el.style as any).gridTemplateColumns = '1fr 0.5fr'; (this.$el.style as any).gridTemplateRows = '1fr 1fr'; @@ -35,7 +35,7 @@ export default Vue.extend({ (tags[1].$el.style as any).gridRow = '1 / 2'; (tags[2].$el.style as any).gridColumn = '2 / 3'; (tags[2].$el.style as any).gridRow = '2 / 3'; - } else if (this.images.length == 4) { + } else if (this.mediaList.length == 4) { (this.$el.style as any).gridTemplateColumns = '1fr 1fr'; (this.$el.style as any).gridTemplateRows = '1fr 1fr'; @@ -53,7 +53,7 @@ export default Vue.extend({ </script> <style lang="stylus" scoped> -.mk-images +.mk-media-list display grid grid-gap 4px height 256px diff --git a/src/web/app/desktop/views/components/index.ts b/src/web/app/desktop/views/components/index.ts index 52b9680baa..9bca603a53 100644 --- a/src/web/app/desktop/views/components/index.ts +++ b/src/web/app/desktop/views/components/index.ts @@ -11,8 +11,8 @@ import postFormWindow from './post-form-window.vue'; import repostFormWindow from './repost-form-window.vue'; import analogClock from './analog-clock.vue'; import ellipsisIcon from './ellipsis-icon.vue'; -import imagesImage from './images-image.vue'; -import imagesImageDialog from './images-image-dialog.vue'; +import mediaImage from './media-image.vue'; +import mediaImageDialog from './media-image-dialog.vue'; import notifications from './notifications.vue'; import postForm from './post-form.vue'; import repostForm from './repost-form.vue'; @@ -40,8 +40,8 @@ Vue.component('mk-post-form-window', postFormWindow); Vue.component('mk-repost-form-window', repostFormWindow); Vue.component('mk-analog-clock', analogClock); Vue.component('mk-ellipsis-icon', ellipsisIcon); -Vue.component('mk-images-image', imagesImage); -Vue.component('mk-images-image-dialog', imagesImageDialog); +Vue.component('mk-media-image', mediaImage); +Vue.component('mk-media-image-dialog', mediaImageDialog); 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/images-image-dialog.vue b/src/web/app/desktop/views/components/media-image-dialog.vue similarity index 94% rename from src/web/app/desktop/views/components/images-image-dialog.vue rename to src/web/app/desktop/views/components/media-image-dialog.vue index 60afa7af82..dec140d1c9 100644 --- a/src/web/app/desktop/views/components/images-image-dialog.vue +++ b/src/web/app/desktop/views/components/media-image-dialog.vue @@ -1,5 +1,5 @@ <template> -<div class="mk-images-image-dialog"> +<div class="mk-media-image-dialog"> <div class="bg" @click="close"></div> <img :src="image.url" :alt="image.name" :title="image.name" @click="close"/> </div> @@ -34,7 +34,7 @@ export default Vue.extend({ </script> <style lang="stylus" scoped> -.mk-images-image-dialog +.mk-media-image-dialog display block position fixed z-index 2048 diff --git a/src/web/app/desktop/views/components/images-image.vue b/src/web/app/desktop/views/components/media-image.vue similarity index 89% rename from src/web/app/desktop/views/components/images-image.vue rename to src/web/app/desktop/views/components/media-image.vue index 5b7dc41739..bc02d0f9be 100644 --- a/src/web/app/desktop/views/components/images-image.vue +++ b/src/web/app/desktop/views/components/media-image.vue @@ -1,5 +1,5 @@ <template> -<a class="mk-images-image" +<a class="mk-media-image" :href="image.url" @mousemove="onMousemove" @mouseleave="onMouseleave" @@ -11,7 +11,7 @@ <script lang="ts"> import Vue from 'vue'; -import MkImagesImageDialog from './images-image-dialog.vue'; +import MkMediaImageDialog from './media-image-dialog.vue'; export default Vue.extend({ props: ['image'], @@ -39,7 +39,7 @@ export default Vue.extend({ }, onClick() { - (this as any).os.new(MkImagesImageDialog, { + (this as any).os.new(MkMediaImageDialog, { image: this.image }); } @@ -48,7 +48,7 @@ export default Vue.extend({ </script> <style lang="stylus" scoped> -.mk-images-image +.mk-media-image display block cursor zoom-in overflow hidden diff --git a/src/web/app/desktop/views/components/post-detail.sub.vue b/src/web/app/desktop/views/components/post-detail.sub.vue index bf6e3ac3b2..322e1a173a 100644 --- a/src/web/app/desktop/views/components/post-detail.sub.vue +++ b/src/web/app/desktop/views/components/post-detail.sub.vue @@ -18,7 +18,7 @@ <div class="body"> <mk-post-html v-if="post.ast" :ast="post.ast" :i="os.i" :class="$style.text"/> <div class="media" v-if="post.media"> - <mk-images :images="post.media"/> + <mk-media-list :mediaList="post.media"/> </div> </div> </div> diff --git a/src/web/app/desktop/views/components/post-detail.vue b/src/web/app/desktop/views/components/post-detail.vue index 98777e224d..59cd01fbf3 100644 --- a/src/web/app/desktop/views/components/post-detail.vue +++ b/src/web/app/desktop/views/components/post-detail.vue @@ -40,7 +40,7 @@ <div class="body"> <mk-post-html :class="$style.text" v-if="p.ast" :ast="p.ast" :i="os.i"/> <div class="media" v-if="p.media"> - <mk-images :images="p.media"/> + <mk-media-list :mediaList="p.media"/> </div> <mk-poll v-if="p.poll" :post="p"/> <mk-url-preview v-for="url in urls" :url="url" :key="url"/> diff --git a/src/web/app/desktop/views/components/posts.post.vue b/src/web/app/desktop/views/components/posts.post.vue index 073b89957a..cde9b6f85e 100644 --- a/src/web/app/desktop/views/components/posts.post.vue +++ b/src/web/app/desktop/views/components/posts.post.vue @@ -42,7 +42,7 @@ <a class="rp" v-if="p.repost">RP:</a> </div> <div class="media" v-if="p.media"> - <mk-images :images="p.media"/> + <mk-media-list :mediaList="p.media"/> </div> <mk-poll v-if="p.poll" :post="p" ref="pollViewer"/> <div class="tags" v-if="p.tags && p.tags.length > 0"> diff --git a/src/web/app/desktop/views/components/sub-post-content.vue b/src/web/app/desktop/views/components/sub-post-content.vue index 7f4c3b4f6f..662853f65a 100644 --- a/src/web/app/desktop/views/components/sub-post-content.vue +++ b/src/web/app/desktop/views/components/sub-post-content.vue @@ -8,7 +8,7 @@ </div> <details v-if="post.media"> <summary>({{ post.media.length }}つのメディア)</summary> - <mk-images :images="post.media"/> + <mk-media-list :mediaList="post.media"/> </details> <details v-if="post.poll"> <summary>投票</summary> diff --git a/src/web/app/mobile/views/components/index.ts b/src/web/app/mobile/views/components/index.ts index 19135d08dc..4743f50e0d 100644 --- a/src/web/app/mobile/views/components/index.ts +++ b/src/web/app/mobile/views/components/index.ts @@ -4,7 +4,7 @@ import ui from './ui.vue'; import timeline from './timeline.vue'; import post from './post.vue'; import posts from './posts.vue'; -import imagesImage from './images-image.vue'; +import mediaImage from './media-image.vue'; import drive from './drive.vue'; import postPreview from './post-preview.vue'; import subPostContent from './sub-post-content.vue'; @@ -26,7 +26,7 @@ Vue.component('mk-ui', ui); Vue.component('mk-timeline', timeline); Vue.component('mk-post', post); Vue.component('mk-posts', posts); -Vue.component('mk-images-image', imagesImage); +Vue.component('mk-media-image', mediaImage); 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/images-image.vue b/src/web/app/mobile/views/components/media-image.vue similarity index 82% rename from src/web/app/mobile/views/components/images-image.vue rename to src/web/app/mobile/views/components/media-image.vue index 6bc1dc0aee..faf8bad48a 100644 --- a/src/web/app/mobile/views/components/images-image.vue +++ b/src/web/app/mobile/views/components/media-image.vue @@ -1,5 +1,5 @@ <template> -<a class="mk-images-image" :href="image.url" target="_blank" :style="style" :title="image.name"></a> +<a class="mk-media-image" :href="image.url" target="_blank" :style="style" :title="image.name"></a> </template> <script lang="ts"> @@ -19,7 +19,7 @@ export default Vue.extend({ </script> <style lang="stylus" scoped> -.mk-images-image +.mk-media-image display block overflow hidden width 100% diff --git a/src/web/app/mobile/views/components/post-detail.vue b/src/web/app/mobile/views/components/post-detail.vue index 4b0b59eff4..db7509d0f0 100644 --- a/src/web/app/mobile/views/components/post-detail.vue +++ b/src/web/app/mobile/views/components/post-detail.vue @@ -43,7 +43,7 @@ <router-link v-for="tag in p.tags" :key="tag" :to="`/search?q=#${tag}`">{{ tag }}</router-link> </div> <div class="media" v-if="p.media"> - <mk-images :images="p.media"/> + <mk-media-list :mediaList="p.media"/> </div> <mk-poll v-if="p.poll" :post="p"/> <mk-url-preview v-for="url in urls" :url="url" :key="url"/> diff --git a/src/web/app/mobile/views/components/post.vue b/src/web/app/mobile/views/components/post.vue index 8df4dbf22e..cf4c38337d 100644 --- a/src/web/app/mobile/views/components/post.vue +++ b/src/web/app/mobile/views/components/post.vue @@ -41,7 +41,7 @@ <a class="rp" v-if="p.repost != null">RP:</a> </div> <div class="media" v-if="p.media"> - <mk-images :images="p.media"/> + <mk-media-list :mediaList="p.media"/> </div> <mk-poll v-if="p.poll" :post="p" ref="pollViewer"/> <div class="tags" v-if="p.tags && p.tags.length > 0"> diff --git a/src/web/app/mobile/views/components/sub-post-content.vue b/src/web/app/mobile/views/components/sub-post-content.vue index b97f082559..7a9fcb633c 100644 --- a/src/web/app/mobile/views/components/sub-post-content.vue +++ b/src/web/app/mobile/views/components/sub-post-content.vue @@ -7,7 +7,7 @@ </div> <details v-if="post.media"> <summary>({{ post.media.length }}個のメディア)</summary> - <mk-images :images="post.media"/> + <mk-media-list :mediaList="post.media"/> </details> <details v-if="post.poll"> <summary>%i18n:mobile.tags.mk-sub-post-content.poll%</summary> From 4d25db59a9593dbd234423b99fdd792e8d7b6cc7 Mon Sep 17 00:00:00 2001 From: rinsuki <428rinsuki+git@gmail.com> Date: Mon, 26 Mar 2018 17:03:20 +0900 Subject: [PATCH 2/2] :mediaList -> :media-list --- src/web/app/desktop/views/components/post-detail.sub.vue | 2 +- src/web/app/desktop/views/components/post-detail.vue | 2 +- src/web/app/desktop/views/components/posts.post.vue | 2 +- src/web/app/desktop/views/components/sub-post-content.vue | 2 +- src/web/app/mobile/views/components/post-detail.vue | 2 +- src/web/app/mobile/views/components/post.vue | 2 +- src/web/app/mobile/views/components/sub-post-content.vue | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/web/app/desktop/views/components/post-detail.sub.vue b/src/web/app/desktop/views/components/post-detail.sub.vue index 322e1a173a..c35a07d7ca 100644 --- a/src/web/app/desktop/views/components/post-detail.sub.vue +++ b/src/web/app/desktop/views/components/post-detail.sub.vue @@ -18,7 +18,7 @@ <div class="body"> <mk-post-html v-if="post.ast" :ast="post.ast" :i="os.i" :class="$style.text"/> <div class="media" v-if="post.media"> - <mk-media-list :mediaList="post.media"/> + <mk-media-list :media-list="post.media"/> </div> </div> </div> diff --git a/src/web/app/desktop/views/components/post-detail.vue b/src/web/app/desktop/views/components/post-detail.vue index 59cd01fbf3..5845ab4f8f 100644 --- a/src/web/app/desktop/views/components/post-detail.vue +++ b/src/web/app/desktop/views/components/post-detail.vue @@ -40,7 +40,7 @@ <div class="body"> <mk-post-html :class="$style.text" v-if="p.ast" :ast="p.ast" :i="os.i"/> <div class="media" v-if="p.media"> - <mk-media-list :mediaList="p.media"/> + <mk-media-list :media-list="p.media"/> </div> <mk-poll v-if="p.poll" :post="p"/> <mk-url-preview v-for="url in urls" :url="url" :key="url"/> diff --git a/src/web/app/desktop/views/components/posts.post.vue b/src/web/app/desktop/views/components/posts.post.vue index cde9b6f85e..71cbbc68d2 100644 --- a/src/web/app/desktop/views/components/posts.post.vue +++ b/src/web/app/desktop/views/components/posts.post.vue @@ -42,7 +42,7 @@ <a class="rp" v-if="p.repost">RP:</a> </div> <div class="media" v-if="p.media"> - <mk-media-list :mediaList="p.media"/> + <mk-media-list :media-list="p.media"/> </div> <mk-poll v-if="p.poll" :post="p" ref="pollViewer"/> <div class="tags" v-if="p.tags && p.tags.length > 0"> diff --git a/src/web/app/desktop/views/components/sub-post-content.vue b/src/web/app/desktop/views/components/sub-post-content.vue index 662853f65a..8c8f42c801 100644 --- a/src/web/app/desktop/views/components/sub-post-content.vue +++ b/src/web/app/desktop/views/components/sub-post-content.vue @@ -8,7 +8,7 @@ </div> <details v-if="post.media"> <summary>({{ post.media.length }}つのメディア)</summary> - <mk-media-list :mediaList="post.media"/> + <mk-media-list :media-list="post.media"/> </details> <details v-if="post.poll"> <summary>投票</summary> diff --git a/src/web/app/mobile/views/components/post-detail.vue b/src/web/app/mobile/views/components/post-detail.vue index db7509d0f0..9baa5de6d0 100644 --- a/src/web/app/mobile/views/components/post-detail.vue +++ b/src/web/app/mobile/views/components/post-detail.vue @@ -43,7 +43,7 @@ <router-link v-for="tag in p.tags" :key="tag" :to="`/search?q=#${tag}`">{{ tag }}</router-link> </div> <div class="media" v-if="p.media"> - <mk-media-list :mediaList="p.media"/> + <mk-media-list :media-list="p.media"/> </div> <mk-poll v-if="p.poll" :post="p"/> <mk-url-preview v-for="url in urls" :url="url" :key="url"/> diff --git a/src/web/app/mobile/views/components/post.vue b/src/web/app/mobile/views/components/post.vue index cf4c38337d..d53649b117 100644 --- a/src/web/app/mobile/views/components/post.vue +++ b/src/web/app/mobile/views/components/post.vue @@ -41,7 +41,7 @@ <a class="rp" v-if="p.repost != null">RP:</a> </div> <div class="media" v-if="p.media"> - <mk-media-list :mediaList="p.media"/> + <mk-media-list :media-list="p.media"/> </div> <mk-poll v-if="p.poll" :post="p" ref="pollViewer"/> <div class="tags" v-if="p.tags && p.tags.length > 0"> diff --git a/src/web/app/mobile/views/components/sub-post-content.vue b/src/web/app/mobile/views/components/sub-post-content.vue index 7a9fcb633c..389fc420ea 100644 --- a/src/web/app/mobile/views/components/sub-post-content.vue +++ b/src/web/app/mobile/views/components/sub-post-content.vue @@ -7,7 +7,7 @@ </div> <details v-if="post.media"> <summary>({{ post.media.length }}個のメディア)</summary> - <mk-media-list :mediaList="post.media"/> + <mk-media-list :media-list="post.media"/> </details> <details v-if="post.poll"> <summary>%i18n:mobile.tags.mk-sub-post-content.poll%</summary>