summaryrefslogtreecommitdiff
path: root/src/web/app/desktop
diff options
context:
space:
mode:
authorrinsuki <428rinsuki+git@gmail.com>2018-03-26 16:56:46 +0900
committerrinsuki <428rinsuki+git@gmail.com>2018-03-26 16:56:46 +0900
commit2dba24d0da54b5be3d5435c250af832276ae2c8e (patch)
treeebcdc364e6e483dc39b2ccb60714d9f2822fa5b6 /src/web/app/desktop
parentMerge pull request #1297 from rinsuki/fix/1296-broken (diff)
downloadmisskey-2dba24d0da54b5be3d5435c250af832276ae2c8e.tar.gz
misskey-2dba24d0da54b5be3d5435c250af832276ae2c8e.tar.bz2
misskey-2dba24d0da54b5be3d5435c250af832276ae2c8e.zip
mk-images -> mk-media-list, mk-images-image -> mk-media-image
Diffstat (limited to 'src/web/app/desktop')
-rw-r--r--src/web/app/desktop/views/components/index.ts8
-rw-r--r--src/web/app/desktop/views/components/media-image-dialog.vue (renamed from src/web/app/desktop/views/components/images-image-dialog.vue)4
-rw-r--r--src/web/app/desktop/views/components/media-image.vue (renamed from src/web/app/desktop/views/components/images-image.vue)8
-rw-r--r--src/web/app/desktop/views/components/post-detail.sub.vue2
-rw-r--r--src/web/app/desktop/views/components/post-detail.vue2
-rw-r--r--src/web/app/desktop/views/components/posts.post.vue2
-rw-r--r--src/web/app/desktop/views/components/sub-post-content.vue2
7 files changed, 14 insertions, 14 deletions
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
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
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>