Page MenuHomePhorge
Files F85827048

No OneTemporary
Actions

Authored By
Unknown
Size
5 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index c3f52f57dc..7715add58a 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -1,41 +1,55 @@
import nsfwImage from '../../assets/nsfw.png'
import fileTypeService from '../../services/file_type/file_type.service.js'
const Attachment = {
props: [
'attachment',
'nsfw',
'statusId'
],
data () {
return {
nsfwImage,
hideNsfwLocal: this.$store.state.config.hideNsfw,
- showHidden: false
+ showHidden: false,
+ loading: false,
+ img: document.createElement('img')
}
},
computed: {
type () {
return fileTypeService.fileType(this.attachment.mimetype)
},
hidden () {
return this.nsfw && this.hideNsfwLocal && !this.showHidden
+ },
+ autoHeight () {
+ if (this.type === 'image' && this.nsfw) {
+ return {
+ 'min-height': '311px'
+ }
+ }
}
},
methods: {
linkClicked ({target}) {
if (target.tagName === 'A') {
window.open(target.href, '_blank')
}
},
toggleHidden () {
- let img = document.createElement('img')
- img.src = this.attachment.url
- img.onload = () => {
- this.showHidden = !this.showHidden
+ if (this.img.onload) {
+ this.img.onload()
+ } else {
+ this.loading = true
+ this.img.src = this.attachment.url
+ this.img.onload = () => {
+ this.loading = false
+ this.showHidden = !this.showHidden
+ }
}
}
}
}
export default Attachment
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index ad60acf9bd..8f51b89143 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -1,124 +1,126 @@
<template>
- <div class="attachment" :class="type">
- <a class="image-attachment" v-if="hidden" v-on:click.prevent="toggleHidden()">
- <img :key="nsfwImage" :src="nsfwImage"></img>
+ <div class="attachment" :class="{[type]: true, loading}" :style="autoHeight">
+ <a class="image-attachment" v-if="hidden" @click.prevent="toggleHidden()">
+ <img :key="nsfwImage" :src="nsfwImage"/>
</a>
<div class="hider" v-if="nsfw && hideNsfwLocal && !hidden">
<a href="#" @click.prevent="toggleHidden()">Hide</a>
</div>
- <a class="image-attachment" v-if="type === 'image' && !hidden"
- :href="attachment.url" target="_blank">
- <img class="base05-border" referrerpolicy="no-referrer" :src="attachment.large_thumb_url || attachment.url"></img>
+ <a v-if="type === 'image' && !hidden" class="image-attachment" :href="attachment.url" target="_blank">
+ <img class="base05-border" referrerpolicy="no-referrer" :src="attachment.large_thumb_url || attachment.url"/>
</a>
<video v-if="type === 'video' && !hidden" :src="attachment.url" controls></video>
<audio v-if="type === 'audio'" :src="attachment.url" controls></audio>
<div @click.prevent="linkClicked" v-if="type === 'html' && attachment.oembed" class="oembed">
<div v-if="attachment.thumb_url" class="image">
- <img :src="attachment.thumb_url"></img>
+ <img :src="attachment.thumb_url"/>
</div>
<div class="text">
<h1><a :href="attachment.url">{{attachment.oembed.title}}</a></h1>
<div v-html="attachment.oembed.oembedHTML"></div>
</div>
</div>
</div>
</template>
<script src="./attachment.js"></script>
<style lang="scss">
.attachments {
display: flex;
flex-wrap: wrap;
margin-right: -0.8em;
.attachment {
flex: 1 0 30%;
margin: 0.5em 0.8em 0.6em 0.0em;
align-self: flex-start;
&.html {
flex-basis: 100%;
display: flex;
}
+ &.loading {
+ cursor: progress;
+ }
+
.hider {
position: absolute;
margin: 10px;
padding: 5px;
background: rgba(230,230,230,0.6);
border-radius: 5px;
font-weight: bold;
}
video {
height: 100%;
border: 1px solid;
border-radius: 5px;
width: 100%;
}
audio {
width: 100%;
}
img.media-upload {
width: 100%;
height: 100%;
flex: 1;
border: 1px solid;
border-radius: 5px;
}
.oembed {
img {
width: 100%;
}
margin-right: 15px;
}
.oembed {
border: 1px solid;
width: 100%;
display: flex;
.image {
flex: 1;
img {
border: 0px;
border-radius: 5px;
height: 100%;
object-fit: cover;
}
}
.text {
flex: 2;
margin: 8px;
h1 {
font-size: 14px;
margin: 0px;
}
}
}
a.image-attachment {
display: flex;
flex: 1;
img {
- width: 100%;
border-style: solid;
border-width: 1px;
border-radius: 5px;
width: 100%;
height: 100%; /* If this isn't here, chrome will stretch the images */
}
}
}
}
</style>

File Metadata

Mime Type
text/x-diff
Expires
Fri, Oct 30, 1:46 PM (18 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1800180
Default Alt Text
(5 KB)

Event Timeline