Redo everything in the MR

This commit is contained in:
shpuld 2019-01-26 17:45:03 +02:00
parent 8761e039d0
commit 3978aaef84
19 changed files with 563 additions and 92 deletions

View file

@ -499,7 +499,7 @@ nav {
} }
.main { .main {
flex-basis: 60%; flex-basis: 50%;
flex-grow: 1; flex-grow: 1;
flex-shrink: 1; flex-shrink: 1;
} }
@ -533,7 +533,7 @@ nav {
} }
} }
@media all and (min-width: 960px) { @media all and (min-width: 800px) {
body { body {
overflow-y: scroll; overflow-y: scroll;
} }
@ -617,7 +617,7 @@ nav {
color: $fallback--faint; color: $fallback--faint;
color: var(--faint, $fallback--faint); color: var(--faint, $fallback--faint);
} }
@media all and (min-width: 959px) { @media all and (min-width: 800px) {
.logo { .logo {
opacity: 1 !important; opacity: 1 !important;
} }
@ -654,7 +654,7 @@ nav {
border-radius: var(--inputRadius, $fallback--inputRadius); border-radius: var(--inputRadius, $fallback--inputRadius);
} }
@media all and (max-width: 959px) { @media all and (max-width: 800px) {
.mobile-hidden { .mobile-hidden {
display: none; display: none;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View file

@ -1,4 +1,5 @@
import StillImage from '../still-image/still-image.vue' import StillImage from '../still-image/still-image.vue'
import VideoAttachment from '../video_attachment/video_attachment.vue'
import nsfwImage from '../../assets/nsfw.png' import nsfwImage from '../../assets/nsfw.png'
import fileTypeService from '../../services/file_type/file_type.service.js' import fileTypeService from '../../services/file_type/file_type.service.js'
@ -8,6 +9,7 @@ const Attachment = {
'nsfw', 'nsfw',
'statusId', 'statusId',
'size', 'size',
'allowPlay',
'setMedia' 'setMedia'
], ],
data () { data () {
@ -16,11 +18,14 @@ const Attachment = {
hideNsfwLocal: this.$store.state.config.hideNsfw, hideNsfwLocal: this.$store.state.config.hideNsfw,
preloadImage: this.$store.state.config.preloadImage, preloadImage: this.$store.state.config.preloadImage,
loading: false, loading: false,
modalOpen: false img: fileTypeService.fileType(this.attachment.mimetype) === 'image' && document.createElement('img'),
modalOpen: false,
showHidden: false
} }
}, },
components: { components: {
StillImage StillImage,
VideoAttachment
}, },
computed: { computed: {
usePlaceHolder () { usePlaceHolder () {
@ -33,7 +38,7 @@ const Attachment = {
return fileTypeService.fileType(this.attachment.mimetype) return fileTypeService.fileType(this.attachment.mimetype)
}, },
hidden () { hidden () {
return this.nsfw && this.hideNsfwLocal return this.nsfw && this.hideNsfwLocal && !this.showHidden
}, },
isEmpty () { isEmpty () {
return (this.type === 'html' && !this.attachment.oembed) || this.type === 'unknown' return (this.type === 'html' && !this.attachment.oembed) || this.type === 'unknown'
@ -51,15 +56,39 @@ const Attachment = {
window.open(target.href, '_blank') window.open(target.href, '_blank')
} }
}, },
toggleModal (event) { openModal (event) {
if (this.type !== 'image' && this.type !== 'video') { const modalTypes = this.$store.state.config.playVideosInline
return ? ['image']
} : ['image', 'video']
if (fileTypeService.fileMatchesSomeType(modalTypes, this.attachment) ||
this.usePlaceHolder
) {
event.stopPropagation() event.stopPropagation()
event.preventDefault() event.preventDefault()
this.setMedia() this.setMedia()
this.$store.dispatch('setCurrent', this.attachment) this.$store.dispatch('setCurrent', this.attachment)
} }
},
toggleHidden (event) {
if (this.$store.state.config.useOneClickNsfw && !this.showHidden) {
this.openModal(event)
return
}
if (this.img && !this.preloadImage) {
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
}
}
} else {
this.showHidden = !this.showHidden
}
}
} }
} }

View file

@ -1,34 +1,43 @@
<template> <template>
<div v-if="usePlaceHolder" @click="toggleModal"> <div v-if="usePlaceHolder" @click="openModal">
<a class="placeholder" v-if="type !== 'html'" target="_blank" :href="attachment.url">[{{nsfw ? "NSFW/" : ""}}{{type.toUpperCase()}}]</a> <a class="placeholder"
v-if="type !== 'html'"
target="_blank" :href="attachment.url"
>
[{{nsfw ? "NSFW/" : ""}}{{type.toUpperCase()}}]
</a>
</div> </div>
<div <div
v-else class="attachment" v-else class="attachment"
:class="{[type]: true, loading, 'fullwidth': fullwidth, 'nsfw-placeholder': hidden}" :class="{[type]: true, loading, 'fullwidth': fullwidth, 'nsfw-placeholder': hidden}"
v-show="!isEmpty" v-show="!isEmpty"
@click="toggleModal"
> >
<a class="image-attachment" v-if="hidden" :href="attachment.url"> <a class="image-attachment" v-if="hidden" :href="attachment.url" @click.prevent="toggleHidden">
<img :key="nsfwImage" :src="nsfwImage" :class="{'small': isSmall}"/> <img class="nsfw" :key="nsfwImage" :src="nsfwImage" :class="{'small': isSmall}"/>
<i v-if="type === 'video'" class="play-icon icon-play-circled"></i> <i v-if="type === 'video'" class="play-icon icon-play-circled"></i>
</a> </a>
<div class="hider" v-if="nsfw && hideNsfwLocal && !hidden">
<a href="#" @click.prevent="toggleHidden">Hide</a>
</div>
<a v-if="type === 'image' && (!hidden || preloadImage)" <a v-if="type === 'image' && (!hidden || preloadImage)"
@click="openModal"
class="image-attachment" class="image-attachment"
:class="{'hidden': hidden && preloadImage }" :class="{'hidden': hidden && preloadImage }"
:href="attachment.url" target="_blank" :href="attachment.url" target="_blank"
:title="attachment.description" :title="attachment.description"
> >
<StillImage :class="{'small': isSmall}" referrerpolicy="referrerPolicy" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/> <StillImage referrerpolicy="referrerPolicy" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/>
</a> </a>
<a class="video-container" <a class="video-container"
@click="openModal"
v-if="type === 'video' && !hidden" v-if="type === 'video' && !hidden"
:class="{'small': isSmall}" :class="{'small': isSmall}"
:href="attachment.url" :href="attachment.url"
> >
<video class="video" :src="attachment.url"></video> <VideoAttachment class="video" :attachment="attachment" :controls="allowPlay" />
<i class="play-icon icon-play-circled"></i> <i v-if="!allowPlay" class="play-icon icon-play-circled"></i>
</a> </a>
<audio v-if="type === 'audio'" :src="attachment.url" controls></audio> <audio v-if="type === 'audio'" :src="attachment.url" controls></audio>
@ -50,18 +59,18 @@
<style lang="scss"> <style lang="scss">
@import '../../_variables.scss'; @import '../../_variables.scss';
$normalheight: 140px;
$normalwidth: 180px;
$smallheight: 80px;
.attachments { .attachments {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
.attachment.media-upload-container { .attachment.media-upload-container {
flex: 0 0 auto; flex: 0 0 auto;
max-height: $normalheight; max-height: 200px;
max-width: 100%; max-width: 100%;
display: flex;
video {
max-width: 100%;
}
} }
.placeholder { .placeholder {
@ -82,7 +91,6 @@ $smallheight: 80px;
margin: 0.5em 0.5em 0em 0em; margin: 0.5em 0.5em 0em 0em;
align-self: flex-start; align-self: flex-start;
line-height: 0; line-height: 0;
flex-grow: 0;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
@ -92,6 +100,28 @@ $smallheight: 80px;
border-color: var(--border, $fallback--border); border-color: var(--border, $fallback--border);
overflow: hidden; overflow: hidden;
} }
.non-gallery.attachment {
&.video {
flex: 1 0 40%;
}
.nsfw {
height: 260px;
}
.small {
height: 120px;
flex-grow: 0;
}
.video {
height: 260px;
display: flex;
}
video {
max-height: 100%;
object-fit: contain;
}
}
.fullwidth { .fullwidth {
flex-basis: 100%; flex-basis: 100%;
} }
@ -101,14 +131,12 @@ $smallheight: 80px;
} }
.video-container { .video-container {
width: auto; display: flex;
height: $normalheight; max-height: 100%;
max-width: $normalwidth;
} }
.video { .video {
width: auto; width: 100%;
object-fit: cover;
} }
.play-icon { .play-icon {
@ -132,6 +160,7 @@ $smallheight: 80px;
.hider { .hider {
position: absolute; position: absolute;
white-space: nowrap;
margin: 10px; margin: 10px;
padding: 5px; padding: 5px;
background: rgba(230,230,230,0.6); background: rgba(230,230,230,0.6);
@ -142,12 +171,7 @@ $smallheight: 80px;
border-radius: var(--tooltipRadius, $fallback--tooltipRadius); border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
} }
.small {
max-height: $smallheight;
}
video { video {
height: 100%;
z-index: 0; z-index: 0;
} }
@ -157,7 +181,7 @@ $smallheight: 80px;
img.media-upload { img.media-upload {
line-height: 0; line-height: 0;
max-height: $normalheight; max-height: 200px;
max-width: 100%; max-width: 100%;
} }
@ -194,26 +218,20 @@ $smallheight: 80px;
} }
.image-attachment { .image-attachment {
flex-grow: 0; width: 100%;
height: 100%;
&.hidden { &.hidden {
display: none; display: none;
} }
.still-image { .nsfw {
}
.small {
img {
height: $smallheight;
}
}
img {
object-fit: cover; object-fit: cover;
height: $normalheight; width: 100%;
width: auto; height: 100%;
max-width: $normalwidth; }
img {
image-orientation: from-image; image-orientation: from-image;
} }
} }

View file

@ -0,0 +1,55 @@
import Attachment from '../attachment/attachment.vue'
import { chunk, last, dropRight } from 'lodash'
const Gallery = {
data: () => ({
width: 500
}),
props: [
'attachments',
'nsfw',
'setMedia'
],
components: { Attachment },
mounted () {
this.resize()
window.addEventListener('resize', this.resize)
},
destroyed () {
window.removeEventListener('resize', this.resize)
},
computed: {
rows () {
if (!this.attachments) {
return []
}
const rows = chunk(this.attachments, 3)
if (last(rows).length === 1 && rows.length > 1) {
// if 1 attachment on last row -> add it to the previous row instead
const lastAttachment = last(rows)[0]
const allButLastRow = dropRight(rows)
last(allButLastRow).push(lastAttachment)
return allButLastRow
}
return rows
},
rowHeight () {
return itemsPerRow => ({ 'height': `${(this.width / (itemsPerRow + 0.6))}px` })
},
useContainFit () {
return this.$store.state.config.useContainFit
}
},
methods: {
resize () {
// Quick optimization to make resizing not always trigger state change,
// only update attachment size in 10px steps
const width = Math.floor(this.$el.getBoundingClientRect().width / 10) * 10
if (this.width !== width) {
this.width = width
}
}
}
}
export default Gallery

View file

@ -0,0 +1,60 @@
<template>
<div ref="galleryContainer" style="width: 100%;">
<div class="gallery-row" v-for="row in rows" :style="rowHeight(row.length)" :class="{ 'contain-fit': useContainFit, 'cover-fit': !useContainFit }">
<attachment
v-for="attachment in row"
:setMedia="setMedia"
:nsfw="nsfw"
:attachment="attachment"
:allowPlay="false"
:key="attachment.id"
/>
</div>
</div>
</template>
<script src='./gallery.js'></script>
<style lang="scss">
@import '../../_variables.scss';
.gallery-row {
height: 200px;
width: 100%;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
align-content: stretch;
flex-grow: 1;
margin-top: 0.5em;
.attachments, .attachment {
margin: 0 0.5em 0 0;
flex-grow: 1;
height: 100%;
box-sizing: border-box;
}
.image-attachment {
width: 100%;
height: 100%;
}
.video-container {
height: 100%;
}
&.contain-fit {
img, video {
object-fit: contain;
}
}
&.cover-fit {
img, video {
object-fit: cover;
}
}
}
</style>

View file

@ -1,9 +1,11 @@
import StillImage from '../still-image/still-image.vue' import StillImage from '../still-image/still-image.vue'
import VideoAttachment from '../video_attachment/video_attachment.vue'
import fileTypeService from '../../services/file_type/file_type.service.js' import fileTypeService from '../../services/file_type/file_type.service.js'
const MediaModal = { const MediaModal = {
components: { components: {
StillImage StillImage,
VideoAttachment
}, },
computed: { computed: {
showing () { showing () {
@ -17,9 +19,6 @@ const MediaModal = {
}, },
type () { type () {
return this.currentMedia ? fileTypeService.fileType(this.currentMedia.mimetype) : null return this.currentMedia ? fileTypeService.fileType(this.currentMedia.mimetype) : null
},
loopVideo () {
return this.$store.state.config.loopVideo
} }
}, },
created () { created () {

View file

@ -1,14 +1,13 @@
<template> <template>
<div class="modal-view" v-if="showing" @click.prevent="hide"> <div class="modal-view" v-if="showing" @click.prevent="hide">
<img class="modal-image" v-if="type === 'image'" :src="currentMedia.url"></img> <img class="modal-image" v-if="type === 'image'" :src="currentMedia.url"></img>
<video <VideoAttachment
class="modal-image" class="modal-image"
v-if="type === 'video'" v-if="type === 'video'"
:src="currentMedia.url" :attachment="currentMedia"
@click.stop="" :controls="true"
controls autoplay @click.stop.native="">
:loop="loopVideo"> </VideoAttachment>
</video>
</div> </div>
</template> </template>
@ -18,7 +17,7 @@
@import '../../_variables.scss'; @import '../../_variables.scss';
.modal-view { .modal-view {
z-index: 1005; z-index: 1000;
position: fixed; position: fixed;
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;

View file

@ -215,7 +215,7 @@ $validations-cRed: #f04124;
} }
} }
@media all and (max-width: 959px) { @media all and (max-width: 800px) {
.registration-form .container { .registration-form .container {
flex-direction: column-reverse; flex-direction: column-reverse;
} }

View file

@ -13,6 +13,7 @@ const settings = {
hideAttachmentsLocal: user.hideAttachments, hideAttachmentsLocal: user.hideAttachments,
hideAttachmentsInConvLocal: user.hideAttachmentsInConv, hideAttachmentsInConvLocal: user.hideAttachmentsInConv,
hideNsfwLocal: user.hideNsfw, hideNsfwLocal: user.hideNsfw,
useOneClickNsfw: user.useOneClickNsfw,
hideISPLocal: user.hideISP, hideISPLocal: user.hideISP,
preloadImage: user.preloadImage, preloadImage: user.preloadImage,
@ -56,7 +57,17 @@ const settings = {
scopeCopyDefault: this.$t('settings.values.' + instance.scopeCopy), scopeCopyDefault: this.$t('settings.values.' + instance.scopeCopy),
stopGifs: user.stopGifs, stopGifs: user.stopGifs,
webPushNotificationsLocal: user.webPushNotifications webPushNotificationsLocal: user.webPushNotifications,
loopVideoSilentOnlyLocal: user.loopVideosSilentOnly,
loopSilentAvailable:
// Firefox
Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||
// Chrome-likes
Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') ||
// Future spec, still not supported in Nightly 63 as of 08/2018
Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
playVideosInline: user.playVideosInline,
useContainFit: user.useContainFit
} }
}, },
components: { components: {
@ -88,6 +99,9 @@ const settings = {
hideNsfwLocal (value) { hideNsfwLocal (value) {
this.$store.dispatch('setOption', { name: 'hideNsfw', value }) this.$store.dispatch('setOption', { name: 'hideNsfw', value })
}, },
useOneClickNsfw (value) {
this.$store.dispatch('setOption', { name: 'useOneClickNsfw', value })
},
preloadImage (value) { preloadImage (value) {
this.$store.dispatch('setOption', { name: 'preloadImage', value }) this.$store.dispatch('setOption', { name: 'preloadImage', value })
}, },
@ -112,6 +126,9 @@ const settings = {
loopVideoLocal (value) { loopVideoLocal (value) {
this.$store.dispatch('setOption', { name: 'loopVideo', value }) this.$store.dispatch('setOption', { name: 'loopVideo', value })
}, },
loopVideoSilentOnlyLocal (value) {
this.$store.dispatch('setOption', { name: 'loopVideoSilentOnly', value })
},
autoLoadLocal (value) { autoLoadLocal (value) {
this.$store.dispatch('setOption', { name: 'autoLoad', value }) this.$store.dispatch('setOption', { name: 'autoLoad', value })
}, },
@ -146,6 +163,12 @@ const settings = {
webPushNotificationsLocal (value) { webPushNotificationsLocal (value) {
this.$store.dispatch('setOption', { name: 'webPushNotifications', value }) this.$store.dispatch('setOption', { name: 'webPushNotifications', value })
if (value) this.$store.dispatch('registerPushNotifications') if (value) this.$store.dispatch('registerPushNotifications')
},
playVideosInline (value) {
this.$store.dispatch('setOption', { name: 'playVideosInline', value })
},
useContainFit (value) {
this.$store.dispatch('setOption', { name: 'useContainFit', value })
} }
} }
} }

View file

@ -123,6 +123,10 @@
<input :disabled="!hideNsfwLocal" type="checkbox" id="preloadImage" v-model="preloadImage"> <input :disabled="!hideNsfwLocal" type="checkbox" id="preloadImage" v-model="preloadImage">
<label for="preloadImage">{{$t('settings.preload_images')}}</label> <label for="preloadImage">{{$t('settings.preload_images')}}</label>
</li> </li>
<li>
<input type="checkbox" id="useOneClickNsfw" v-model="useOneClickNsfw">
<label for="useOneClickNsfw">{{$t('settings.use_one_click_nsfw')}}</label>
</li>
</ul> </ul>
<li> <li>
<input type="checkbox" id="stopGifs" v-model="stopGifs"> <input type="checkbox" id="stopGifs" v-model="stopGifs">
@ -131,6 +135,23 @@
<li> <li>
<input type="checkbox" id="loopVideo" v-model="loopVideoLocal"> <input type="checkbox" id="loopVideo" v-model="loopVideoLocal">
<label for="loopVideo">{{$t('settings.loop_video')}}</label> <label for="loopVideo">{{$t('settings.loop_video')}}</label>
<ul class="setting-list suboptions" :class="[{disabled: !streamingLocal}]">
<li>
<input :disabled="!loopVideoLocal || !loopSilentAvailable" type="checkbox" id="loopVideoSilentOnly" v-model="loopVideoSilentOnlyLocal">
<label for="loopVideoSilentOnly">{{$t('settings.loop_video_silent_only')}}</label>
<div v-if="!loopSilentAvailable" class="unavailable">
<i class="icon-globe"/>! {{$t('settings.limited_availability')}}
</div>
</li>
</ul>
</li>
<li>
<input type="checkbox" id="playVideosInline" v-model="playVideosInline">
<label for="playVideosInline">{{$t('settings.play_videos_inline')}}</label>
</li>
<li>
<input type="checkbox" id="useContainFit" v-model="useContainFit">
<label for="useContainFit">{{$t('settings.use_contain_fit')}}</label>
</li> </li>
</ul> </ul>
</div> </div>

View file

@ -5,9 +5,11 @@ import DeleteButton from '../delete_button/delete_button.vue'
import PostStatusForm from '../post_status_form/post_status_form.vue' import PostStatusForm from '../post_status_form/post_status_form.vue'
import UserCardContent from '../user_card_content/user_card_content.vue' import UserCardContent from '../user_card_content/user_card_content.vue'
import StillImage from '../still-image/still-image.vue' import StillImage from '../still-image/still-image.vue'
import Gallery from '../gallery/gallery.vue'
import { filter, find } from 'lodash' import { filter, find } from 'lodash'
import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js' import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
import fileType from 'src/services/file_type/file_type.service'
const Status = { const Status = {
name: 'Status', name: 'Status',
@ -197,6 +199,24 @@ const Status = {
return 'small' return 'small'
} }
return 'normal' return 'normal'
},
galleryTypes () {
if (this.attachmentSize === 'hide') {
return []
}
return this.$store.state.config.playVideosInline
? ['image']
: ['image', 'video']
},
galleryAttachments () {
return this.status.attachments.filter(
file => fileType.fileMatchesSomeType(this.galleryTypes, file)
)
},
nonGalleryAttachments () {
return this.status.attachments.filter(
file => !fileType.fileMatchesSomeType(this.galleryTypes, file)
)
} }
}, },
components: { components: {
@ -206,7 +226,8 @@ const Status = {
DeleteButton, DeleteButton,
PostStatusForm, PostStatusForm,
UserCardContent, UserCardContent,
StillImage StillImage,
Gallery
}, },
methods: { methods: {
visibilityIcon (visibility) { visibilityIcon (visibility) {
@ -283,7 +304,7 @@ const Status = {
return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames) return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
}, },
setMedia () { setMedia () {
const attachments = this.status.attachments const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
return () => this.$store.dispatch('setMedia', attachments) return () => this.$store.dispatch('setMedia', attachments)
} }
}, },

View file

@ -93,16 +93,23 @@
<a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a> <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a>
</div> </div>
<div v-if='status.attachments && !hideSubjectStatus' class='attachments media-body'> <div v-if="status.attachments && !hideSubjectStatus" class="attachments media-body">
<attachment <attachment
class="non-gallery"
v-for="attachment in nonGalleryAttachments"
:size="attachmentSize" :size="attachmentSize"
:status-id="status.id"
:nsfw="nsfwClickthrough" :nsfw="nsfwClickthrough"
:attachment="attachment" :attachment="attachment"
:set-media="setMedia()" :allowPlay="true"
v-for="attachment in status.attachments" :setMedia="setMedia()"
:key="attachment.id"> :key="attachment.id"
</attachment> />
<gallery
v-if="galleryAttachments.length > 0"
:nsfw="nsfwClickthrough"
:attachments="galleryAttachments"
:setMedia="setMedia()"
/>
</div> </div>
<div v-if="!noHeading && !noReplyLinks" class='status-actions media-body'> <div v-if="!noHeading && !noReplyLinks" class='status-actions media-body'>
@ -568,7 +575,7 @@ a.unmute {
} }
} }
@media all and (max-width: 960px) { @media all and (max-width: 800px) {
.status-el { .status-el {
.retweet-info { .retweet-info {
.avatar { .avatar {

View file

@ -0,0 +1,31 @@
const VideoAttachment = {
props: ['attachment', 'controls'],
data () {
return {
loopVideo: this.$store.state.config.loopVideo
}
},
methods: {
onVideoDataLoad (e) {
const target = e.srcElement || e.target
if (typeof target.webkitAudioDecodedByteCount !== 'undefined') {
// non-zero if video has audio track
if (target.webkitAudioDecodedByteCount > 0) {
this.loopVideo = this.loopVideo && !this.$store.state.config.loopVideoSilentOnly
}
} else if (typeof target.mozHasAudio !== 'undefined') {
// true if video has audio track
if (target.mozHasAudio) {
this.loopVideo = this.loopVideo && !this.$store.state.config.loopVideoSilentOnly
}
} else if (typeof target.audioTracks !== 'undefined') {
if (target.audioTracks.length > 0) {
this.loopVideo = this.loopVideo && !this.$store.state.config.loopVideoSilentOnly
}
}
}
}
}
export default VideoAttachment

View file

@ -0,0 +1,11 @@
<template>
<video class="video"
@loadeddata="onVideoDataLoad"
:src="attachment.url"
:loop="loopVideo"
:controls="controls"
playsinline
/>
</template>
<script src="./video_attachment.js"></script>

View file

@ -132,6 +132,7 @@
"hide_attachments_in_tl": "Hide attachments in timeline", "hide_attachments_in_tl": "Hide attachments in timeline",
"hide_isp": "Hide instance-specific panel", "hide_isp": "Hide instance-specific panel",
"preload_images": "Preload images", "preload_images": "Preload images",
"use_one_click_nsfw": "Open NSFW attachments with just one click",
"hide_post_stats": "Hide post statistics (e.g. the number of favorites)", "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
"hide_user_stats": "Hide user statistics (e.g. the number of followers)", "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
"import_followers_from_a_csv_file": "Import follows from a csv file", "import_followers_from_a_csv_file": "Import follows from a csv file",
@ -148,6 +149,8 @@
"lock_account_description": "Restrict your account to approved followers only", "lock_account_description": "Restrict your account to approved followers only",
"loop_video": "Loop videos", "loop_video": "Loop videos",
"loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")", "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
"play_videos_inline": "Play videos directly on timeline",
"use_contain_fit": "Don't crop the attachment in thumbnails",
"name": "Name", "name": "Name",
"name_bio": "Name & Bio", "name_bio": "Name & Bio",
"new_password": "New password", "new_password": "New password",

View file

@ -1,4 +1,16 @@
{ {
"chat": {
"title": "Chat"
},
"features_panel": {
"chat": "Chat",
"gopher": "Gopher",
"media_proxy": "Media-välityspalvelin",
"scope_options": "Näkyvyyden rajaus",
"text_limit": "Tekstin pituusraja",
"title": "Ominaisuudet",
"who_to_follow": "Seurausehdotukset"
},
"finder": { "finder": {
"error_fetching_user": "Virhe hakiessa käyttäjää", "error_fetching_user": "Virhe hakiessa käyttäjää",
"find_user": "Hae käyttäjä" "find_user": "Hae käyttäjä"
@ -9,85 +21,243 @@
}, },
"login": { "login": {
"login": "Kirjaudu sisään", "login": "Kirjaudu sisään",
"description": "Kirjaudu sisään OAuthilla",
"logout": "Kirjaudu ulos", "logout": "Kirjaudu ulos",
"password": "Salasana", "password": "Salasana",
"placeholder": "esim. lain", "placeholder": "esim. Seppo",
"register": "Rekisteröidy", "register": "Rekisteröidy",
"username": "Käyttäjänimi" "username": "Käyttäjänimi"
}, },
"nav": { "nav": {
"about": "Tietoja",
"back": "Takaisin",
"chat": "Paikallinen Chat",
"friend_requests": "Seurauspyynnöt",
"mentions": "Maininnat", "mentions": "Maininnat",
"dms": "Yksityisviestit",
"public_tl": "Julkinen Aikajana", "public_tl": "Julkinen Aikajana",
"timeline": "Aikajana", "timeline": "Aikajana",
"twkn": "Koko Tunnettu Verkosto" "twkn": "Koko Tunnettu Verkosto",
"user_search": "Käyttäjähaku",
"who_to_follow": "Seurausehdotukset",
"preferences": "Asetukset"
}, },
"notifications": { "notifications": {
"broken_favorite": "Viestiä ei löydetty...",
"favorited_you": "tykkäsi viestistäsi", "favorited_you": "tykkäsi viestistäsi",
"followed_you": "seuraa sinua", "followed_you": "seuraa sinua",
"load_older": "Lataa vanhempia ilmoituksia",
"notifications": "Ilmoitukset", "notifications": "Ilmoitukset",
"read": "Lue!", "read": "Lue!",
"repeated_you": "toisti viestisi" "repeated_you": "toisti viestisi"
}, },
"post_status": { "post_status": {
"new_status": "Uusi viesti",
"account_not_locked_warning": "Tilisi ei ole {0}. Kuka vain voi seurata sinua nähdäksesi 'vain-seuraajille' -viestisi",
"account_not_locked_warning_link": "lukittu",
"attachments_sensitive": "Merkkaa liitteet arkaluonteisiksi",
"content_type": {
"plain_text": "Tavallinen teksti"
},
"content_warning": "Aihe (valinnainen)",
"default": "Tulin juuri saunasta.", "default": "Tulin juuri saunasta.",
"posting": "Lähetetään" "direct_warning": "Tämä viesti näkyy vain mainituille käyttäjille.",
"posting": "Lähetetään",
"scope": {
"direct": "Yksityisviesti - Näkyy vain mainituille käyttäjille",
"private": "Vain-seuraajille - Näkyy vain seuraajillesi",
"public": "Julkinen - Näkyy julkisilla aikajanoilla",
"unlisted": "Listaamaton - Ei näy julkisilla aikajanoilla"
}
}, },
"registration": { "registration": {
"bio": "Kuvaus", "bio": "Kuvaus",
"email": "Sähköposti", "email": "Sähköposti",
"fullname": "Koko nimi", "fullname": "Koko nimi",
"password_confirm": "Salasanan vahvistaminen", "password_confirm": "Salasanan vahvistaminen",
"registration": "Rekisteröityminen" "registration": "Rekisteröityminen",
"token": "Kutsuvaltuus",
"captcha": "Varmenne",
"new_captcha": "Paina kuvaa saadaksesi uuden varmenteen",
"validations": {
"username_required": "ei voi olla tyhjä",
"fullname_required": "ei voi olla tyhjä",
"email_required": "ei voi olla tyhjä",
"password_required": "ei voi olla tyhjä",
"password_confirmation_required": "ei voi olla tyhjä",
"password_confirmation_match": "pitää vastata salasanaa"
}
}, },
"settings": { "settings": {
"attachmentRadius": "Liitteet",
"attachments": "Liitteet", "attachments": "Liitteet",
"autoload": "Lataa vanhempia viestejä automaattisesti ruudun pohjalla", "autoload": "Lataa vanhempia viestejä automaattisesti ruudun pohjalla",
"avatar": "Profiilikuva", "avatar": "Profiilikuva",
"avatarAltRadius": "Profiilikuvat (ilmoitukset)",
"avatarRadius": "Profiilikuvat",
"background": "Tausta", "background": "Tausta",
"bio": "Kuvaus", "bio": "Kuvaus",
"btnRadius": "Napit",
"cBlue": "Sininen (Vastaukset, seuraukset)",
"cGreen": "Vihreä (Toistot)",
"cOrange": "Oranssi (Tykkäykset)",
"cRed": "Punainen (Peruminen)",
"change_password": "Vaihda salasana",
"change_password_error": "Virhe vaihtaessa salasanaa.",
"changed_password": "Salasana vaihdettu!",
"collapse_subject": "Minimoi viestit, joille on asetettu aihe",
"composing": "Viestien laatiminen",
"confirm_new_password": "Vahvista uusi salasana",
"current_avatar": "Nykyinen profiilikuvasi", "current_avatar": "Nykyinen profiilikuvasi",
"current_password": "Nykyinen salasana",
"current_profile_banner": "Nykyinen julisteesi", "current_profile_banner": "Nykyinen julisteesi",
"data_import_export_tab": "Tietojen tuonti / vienti",
"default_vis": "Oletusnäkyvyysrajaus",
"delete_account": "Poista tili",
"delete_account_description": "Poista tilisi ja viestisi pysyvästi.",
"delete_account_error": "Virhe poistaessa tiliäsi. Jos virhe jatkuu, ota yhteyttä palvelimesi ylläpitoon.",
"delete_account_instructions": "Syötä salasanasi vahvistaaksesi tilin poiston.",
"export_theme": "Tallenna teema",
"filtering": "Suodatus", "filtering": "Suodatus",
"filtering_explanation": "Kaikki viestit, jotka sisältävät näitä sanoja, suodatetaan. Yksi sana per rivi.", "filtering_explanation": "Kaikki viestit, jotka sisältävät näitä sanoja, suodatetaan. Yksi sana per rivi.",
"follow_export": "Seurausten vienti",
"follow_export_button": "Vie seurauksesi CSV-tiedostoon",
"follow_export_processing": "Käsitellään, sinua pyydetään lataamaan tiedosto hetken päästä",
"follow_import": "Seurausten tuonti",
"follow_import_error": "Virhe tuodessa seuraksia",
"follows_imported": "Seuraukset tuotu! Niiden käsittely vie hetken.",
"foreground": "Korostus", "foreground": "Korostus",
"general": "Yleinen",
"hide_attachments_in_convo": "Piilota liitteet keskusteluissa", "hide_attachments_in_convo": "Piilota liitteet keskusteluissa",
"hide_attachments_in_tl": "Piilota liitteet aikajanalla", "hide_attachments_in_tl": "Piilota liitteet aikajanalla",
"hide_isp": "Piilota palvelimenkohtainen ruutu",
"preload_images": "Esilataa kuvat",
"use_one_click_nsfw": "Avaa NSFW-liitteet yhdellä painalluksella",
"hide_post_stats": "Piilota viestien statistiikka (esim. tykkäysten määrä)",
"hide_user_stats": "Piilota käyttäjien statistiikka (esim. seuraajien määrä)",
"import_followers_from_a_csv_file": "Tuo seuraukset CSV-tiedostosta",
"import_theme": "Tuo tallennettu teema",
"inputRadius": "Syöttökentät",
"checkboxRadius": "Valintalaatikot",
"instance_default": "(oletus: {value})",
"instance_default_simple": "(oletus)",
"interface": "Käyttöliittymä",
"interfaceLanguage": "Käyttöliittymän kieli",
"invalid_theme_imported": "Tuotu tallennettu teema on epäkelpo, muutoksia ei tehty nykyiseen teemaasi.",
"limited_availability": "Ei saatavilla selaimessasi",
"links": "Linkit", "links": "Linkit",
"lock_account_description": "Vain erikseen hyväksytyt käyttäjät voivat seurata tiliäsi",
"loop_video": "Uudelleentoista videot",
"loop_video_silent_only": "Uudelleentoista ainoastaan äänettömät videot (Video-\"giffit\")",
"play_videos_inline": "Toista videot suoraan aikajanalla",
"use_contain_fit": "Älä rajaa liitteitä esikatselussa",
"name": "Nimi", "name": "Nimi",
"name_bio": "Nimi ja kuvaus", "name_bio": "Nimi ja kuvaus",
"nsfw_clickthrough": "Piilota NSFW liitteet klikkauksen taakse.", "new_password": "Uusi salasana",
"notification_visibility": "Ilmoitusten näkyvyys",
"notification_visibility_follows": "Seuraukset",
"notification_visibility_likes": "Tykkäykset",
"notification_visibility_mentions": "Maininnat",
"notification_visibility_repeats": "Toistot",
"no_rich_text_description": "Älä näytä tekstin muotoilua.",
"hide_network_description": "Älä näytä seurauksiani tai seuraajiani",
"nsfw_clickthrough": "Piilota NSFW liitteet klikkauksen taakse",
"panelRadius": "Ruudut",
"pause_on_unfocused": "Pysäytä automaattinen viestien näyttö välilehden ollessa pois fokuksesta",
"presets": "Valmiit teemat", "presets": "Valmiit teemat",
"profile_background": "Taustakuva", "profile_background": "Taustakuva",
"profile_banner": "Juliste", "profile_banner": "Juliste",
"profile_tab": "Profiili",
"radii_help": "Aseta reunojen pyöristys (pikseleinä)",
"replies_in_timeline": "Keskustelut aikajanalla",
"reply_link_preview": "Keskusteluiden vastauslinkkien esikatselu", "reply_link_preview": "Keskusteluiden vastauslinkkien esikatselu",
"reply_visibility_all": "Näytä kaikki vastaukset",
"reply_visibility_following": "Näytä vain vastaukset minulle tai seuraamilleni käyttäjille",
"reply_visibility_self": "Näytä vain vastaukset minulle",
"saving_err": "Virhe tallentaessa asetuksia",
"saving_ok": "Asetukset tallennettu",
"security_tab": "Tietoturva",
"scope_copy": "Kopioi näkyvyysrajaus vastatessa (Yksityisviestit aina kopioivat)",
"set_new_avatar": "Aseta uusi profiilikuva", "set_new_avatar": "Aseta uusi profiilikuva",
"set_new_profile_background": "Aseta uusi taustakuva", "set_new_profile_background": "Aseta uusi taustakuva",
"set_new_profile_banner": "Aseta uusi juliste", "set_new_profile_banner": "Aseta uusi juliste",
"settings": "Asetukset", "settings": "Asetukset",
"subject_input_always_show": "Näytä aihe-kenttä",
"subject_line_behavior": "Aihe-kentän kopiointi",
"subject_line_email": "Kuten sähköposti: \"re: aihe\"",
"subject_line_mastodon": "Kopioi sellaisenaan",
"subject_line_noop": "Älä kopioi",
"stop_gifs": "Toista giffit vain kohdistaessa",
"streaming": "Näytä uudet viestit automaattisesti ollessasi ruudun huipulla", "streaming": "Näytä uudet viestit automaattisesti ollessasi ruudun huipulla",
"text": "Teksti", "text": "Teksti",
"theme": "Teema", "theme": "Teema",
"theme_help": "Käytä heksadesimaalivärejä muokataksesi väriteemaasi.", "theme_help": "Käytä heksadesimaalivärejä muokataksesi väriteemaasi.",
"user_settings": "Käyttäjän asetukset" "theme_help_v2_1": "Voit asettaa tiettyjen osien värin tai läpinäkyvyyden täyttämällä valintalaatikon, käytä \"Tyhjennä kaikki\"-nappia tyhjentääksesi kaiken.",
"theme_help_v2_2": "Ikonit kenttien alla ovat kontrasti-indikaattoreita, lisätietoa kohdistamalla. Käyttäessä läpinäkyvyyttä ne näyttävät pahimman skenaarion.",
"tooltipRadius": "Ohje- tai huomioviestit",
"user_settings": "Käyttäjän asetukset",
"values": {
"false": "pois päältä",
"true": "päällä"
}
}, },
"timeline": { "timeline": {
"collapse": "Sulje", "collapse": "Sulje",
"conversation": "Keskustelu", "conversation": "Keskustelu",
"error_fetching": "Virhe ladatessa viestejä", "error_fetching": "Virhe ladatessa viestejä",
"load_older": "Lataa vanhempia viestejä", "load_older": "Lataa vanhempia viestejä",
"no_retweet_hint": "Viesti ei ole julkinen, eikä sitä voi toistaa",
"repeated": "toisti", "repeated": "toisti",
"show_new": "Näytä uudet", "show_new": "Näytä uudet",
"up_to_date": "Ajantasalla" "up_to_date": "Ajantasalla"
}, },
"user_card": { "user_card": {
"approve": "Hyväksy",
"block": "Estä",
"blocked": "Estetty!",
"deny": "Älä hyväksy",
"follow": "Seuraa", "follow": "Seuraa",
"follow_sent": "Pyyntö lähetetty!",
"follow_progress": "Pyydetään...",
"follow_again": "Lähetä pyyntö uudestaan",
"follow_unfollow": "Älä seuraa",
"followees": "Seuraa", "followees": "Seuraa",
"followers": "Seuraajat", "followers": "Seuraajat",
"following": "Seuraat!", "following": "Seuraat!",
"follows_you": "Seuraa sinua!", "follows_you": "Seuraa sinua!",
"its_you": "Sinun tili!",
"mute": "Hiljennä", "mute": "Hiljennä",
"muted": "Hiljennetty", "muted": "Hiljennetty",
"per_day": "päivässä", "per_day": "päivässä",
"remote_follow": "Seuraa muualta",
"statuses": "Viestit" "statuses": "Viestit"
},
"user_profile": {
"timeline_title": "Käyttäjän aikajana"
},
"who_to_follow": {
"more": "Lisää",
"who_to_follow": "Seurausehdotukset"
},
"tool_tip": {
"media_upload": "Lataa tiedosto",
"repeat": "Toista",
"reply": "Vastaa",
"favorite": "Tykkää",
"user_settings": "Käyttäjäasetukset"
},
"upload":{
"error": {
"base": "Lataus epäonnistui.",
"file_too_big": "Tiedosto liian suuri [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
"default": "Yritä uudestaan myöhemmin"
},
"file_size_units": {
"B": "tavua",
"KiB": "kt",
"MiB": "Mt",
"GiB": "Gt",
"TiB": "Tt"
}
} }
} }

View file

@ -1,27 +1,32 @@
const fileType = (typeString) => { // TODO this func might as well take the entire file and use its mimetype
let type = 'unknown' // or the entire service could be just mimetype service that only operates
// on mimetypes and not files. Currently the naming is confusing.
if (typeString.match(/text\/html/)) { const fileType = mimetype => {
type = 'html' if (mimetype.match(/text\/html/)) {
return 'html'
} }
if (typeString.match(/image/)) { if (mimetype.match(/image/)) {
type = 'image' return 'image'
} }
if (typeString.match(/video/)) { if (mimetype.match(/video/)) {
type = 'video' return 'video'
} }
if (typeString.match(/audio/)) { if (mimetype.match(/audio/)) {
type = 'audio' return 'audio'
} }
return type return 'unknown'
} }
const fileMatchesSomeType = (types, file) =>
types.some(type => fileType(file.mimetype) === type)
const fileTypeService = { const fileTypeService = {
fileType fileType,
fileMatchesSomeType
} }
export default fileTypeService export default fileTypeService

View file

@ -0,0 +1,19 @@
import fileType from 'src/services/file_type/file_type.service.js'
describe('fileType service', () => {
describe('fileMatchesSomeType', () => {
it('should be true when file type is one of the listed', () => {
const file = { mimetype: 'audio/mpeg' }
const types = ['video', 'audio']
expect(fileType.fileMatchesSomeType(types, file)).to.eql(true)
})
it('should be false when files type is not included in type list', () => {
const file = { mimetype: 'audio/mpeg' }
const types = ['image', 'video']
expect(fileType.fileMatchesSomeType(types, file)).to.eql(false)
})
})
})