diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-08-16 07:59:16 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 07:59:16 +0900 |
| commit | a8fb0d477fb67661251c57910a0c4f3d2ac856d1 (patch) | |
| tree | 5986efd36e0a42acd290a37403059eb64a63b13e /src/client | |
| parent | Merge pull request #2252 from syuilo/greenkeeper/minio-7.0.0 (diff) | |
| parent | :v: (diff) | |
| download | misskey-a8fb0d477fb67661251c57910a0c4f3d2ac856d1.tar.gz misskey-a8fb0d477fb67661251c57910a0c4f3d2ac856d1.tar.bz2 misskey-a8fb0d477fb67661251c57910a0c4f3d2ac856d1.zip | |
Merge pull request #2251 from syuilo/provide-thumbnails
Provide drive file thumbnails
Diffstat (limited to 'src/client')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/client/app/desktop/views/components/drive.file.vue b/src/client/app/desktop/views/components/drive.file.vue index 55218625c1..3b5be19dcf 100644 --- a/src/client/app/desktop/views/components/drive.file.vue +++ b/src/client/app/desktop/views/components/drive.file.vue @@ -16,7 +16,7 @@ <p>%i18n:@banner%</p> </div> <div class="thumbnail" ref="thumbnail" :style="`background-color: ${ background }`"> - <img :src="file.url" alt="" @load="onThumbnailLoaded"/> + <img :src="file.thumbnailUrl" alt="" @load="onThumbnailLoaded"/> </div> <p class="name"> <span>{{ file.name.lastIndexOf('.') != -1 ? file.name.substr(0, file.name.lastIndexOf('.')) : file.name }}</span> diff --git a/src/client/app/desktop/views/components/media-image.vue b/src/client/app/desktop/views/components/media-image.vue index 74bb03f4ed..8b68f260fa 100644 --- a/src/client/app/desktop/views/components/media-image.vue +++ b/src/client/app/desktop/views/components/media-image.vue @@ -37,7 +37,7 @@ export default Vue.extend({ style(): any { return { 'background-color': this.image.properties.avgColor && this.image.properties.avgColor.length == 3 ? `rgb(${this.image.properties.avgColor.join(',')})` : 'transparent', - 'background-image': this.raw ? `url(${this.image.url})` : `url(${this.image.url})` + 'background-image': this.raw ? `url(${this.image.url})` : `url(${this.image.thumbnailUrl})` }; } }, diff --git a/src/client/app/mobile/views/components/drive.file.vue b/src/client/app/mobile/views/components/drive.file.vue index 776e11ecf8..c337629cb6 100644 --- a/src/client/app/mobile/views/components/drive.file.vue +++ b/src/client/app/mobile/views/components/drive.file.vue @@ -43,7 +43,7 @@ export default Vue.extend({ thumbnail(): any { return { 'background-color': this.file.properties.avgColor && this.file.properties.avgColor.length == 3 ? `rgb(${this.file.properties.avgColor.join(',')})` : 'transparent', - 'background-image': `url(${this.file.url})` + 'background-image': `url(${this.file.thumbnailUrl})` }; } }, diff --git a/src/client/app/mobile/views/components/media-image.vue b/src/client/app/mobile/views/components/media-image.vue index d9d68fa7ba..e40069bbe3 100644 --- a/src/client/app/mobile/views/components/media-image.vue +++ b/src/client/app/mobile/views/components/media-image.vue @@ -27,7 +27,7 @@ export default Vue.extend({ }, computed: { style(): any { - let url = `url(${this.image.url})`; + let url = `url(${this.image.thumbnailUrl})`; if (this.$store.state.device.loadRemoteMedia || this.$store.state.device.lightmode) { url = null; |