diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-03-26 17:04:40 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 17:04:40 +0900 |
| commit | e2ad98de82b4252f615c48f7123dd0e5c3c07879 (patch) | |
| tree | 7cefbd98b138154b76d3fdb0285844e36cfb42fe /src/web/app/mobile | |
| parent | Merge pull request #1297 from rinsuki/fix/1296-broken (diff) | |
| parent | :mediaList -> :media-list (diff) | |
| download | misskey-e2ad98de82b4252f615c48f7123dd0e5c3c07879.tar.gz misskey-e2ad98de82b4252f615c48f7123dd0e5c3c07879.tar.bz2 misskey-e2ad98de82b4252f615c48f7123dd0e5c3c07879.zip | |
Merge pull request #1298 from rinsuki/features/mk-media
mk-images -> mk-media-list, mk-images-image -> mk-media-image
Diffstat (limited to 'src/web/app/mobile')
| -rw-r--r-- | src/web/app/mobile/views/components/index.ts | 4 | ||||
| -rw-r--r-- | src/web/app/mobile/views/components/media-image.vue (renamed from src/web/app/mobile/views/components/images-image.vue) | 4 | ||||
| -rw-r--r-- | src/web/app/mobile/views/components/post-detail.vue | 2 | ||||
| -rw-r--r-- | src/web/app/mobile/views/components/post.vue | 2 | ||||
| -rw-r--r-- | src/web/app/mobile/views/components/sub-post-content.vue | 2 |
5 files changed, 7 insertions, 7 deletions
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 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..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-images :images="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 8df4dbf22e..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-images :images="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 b97f082559..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-images :images="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> |