make hiding more efficient, make hiding not do its thing for reply forms or playing videos

This commit is contained in:
Shpuld Shpuldson 2020-03-17 14:43:33 +02:00
parent 42e43511de
commit 99e60f1821
5 changed files with 3 additions and 57 deletions

View file

@ -57,7 +57,6 @@ const conversation = {
computed: {
hideStatus () {
if (this.$refs.statusComponent && this.$refs.statusComponent[0]) {
console.log(this.$refs.statusComponent[0].suspendable)
return this.virtualHidden && this.$refs.statusComponent[0].suspendable
} else {
return this.virtualHidden

View file

@ -437,7 +437,6 @@ const Status = {
return () => this.$store.dispatch('setMedia', attachments)
},
addVideoPlaying (id) {
console.log('video playing', id)
this.videosPlaying.push(id)
},
removeVideoPlaying (id) {
@ -473,7 +472,6 @@ const Status = {
}
},
'isSuspendable': function (val) {
console.log('suspendable changed', val)
this.suspendable = val
}
},

View file

@ -118,13 +118,6 @@ const Timeline = {
if (typeof document.hidden !== 'undefined') document.removeEventListener('visibilitychange', this.handleVisibilityChange, false)
this.$store.commit('setLoading', { timeline: this.timelineName, value: false })
},
beforeUpdate () {
timer = performance.now()
},
updated () {
let now = performance.now()
console.log('Timeline update took: ', now - timer)
},
methods: {
handleShortKey (e) {
// Ignore when input fields are focused

View file

@ -10,7 +10,6 @@ const VideoAttachment = {
computed: {
loopVideo () {
if (this.$store.getters.mergedConfig.loopVideoSilentOnly) {
console.log('do I have audio', this.hasAudio)
return !this.hasAudio
}
return this.$store.getters.mergedConfig.loopVideo
@ -18,37 +17,32 @@ const VideoAttachment = {
},
methods: {
onPlaying (e) {
// Don't bother stopping suspend on small looping gif-like videos
this.checkForAudio(e)
this.setHasAudio(e)
if (this.loopVideo) {
return
this.$emit('play', { looping: true })
}
this.$emit('play')
},
onPaused (e) {
this.$emit('pause')
},
checkForAudio (e) {
setHasAudio (e) {
const target = e.srcElement || e.target
if (this.hasAudio) return
console.log(target.webkitAudioDecodedByteCount)
if (typeof target.webkitAudioDecodedByteCount !== 'undefined') {
// non-zero if video has audio track
if (target.webkitAudioDecodedByteCount > 0) {
console.log('1')
this.hasAudio = true
}
}
if (typeof target.mozHasAudio !== 'undefined') {
// true if video has audio track
if (target.mozHasAudio) {
console.log('2')
this.hasAudio = true
}
}
if (typeof target.audioTracks !== 'undefined') {
if (target.audioTracks.length > 0) {
console.log('3')
this.hasAudio = true
}
}

View file

@ -487,18 +487,6 @@ const deleteUser = ({ credentials, ...user }) => {
headers: headers
})
}
/* eslint-disable no-useless-escape */
// const statusStr = `{"account":{"acct":"lain","avatar":"https://lain.com/media/a95b8525b8d90c2d5ec81f46e1ca2b81da199ada0011922a262cf34fedf9125b.png","avatar_static":"https://lain.com/media/a95b8525b8d90c2d5ec81f46e1ca2b81da199ada0011922a262cf34fedf9125b.png","bot":false,"created_at":"2020-01-10T15:28:46.000Z","display_name":"lain","emojis":[],"fields":[],"followers_count":479,"following_count":80,"header":"https://lain.com/images/banner.png","header_static":"https://lain.com/images/banner.png","id":"9qrWmR0cKniB0YU0TA","locked":false,"note":"No more hiding","pleroma":{"background_image":null,"confirmation_pending":true,"hide_favorites":true,"hide_followers":false,"hide_followers_count":false,"hide_follows":false,"hide_follows_count":false,"is_admin":false,"is_moderator":false,"relationship":{},"skip_thread_containment":false,"tags":[]},"source":{"fields":[],"note":"No more hiding","pleroma":{"actor_type":"Person","discoverable":false},"sensitive":false},"statuses_count":7239,"url":"https://lain.com/users/lain","username":"lain"},"application":{"name":"Web","website":null},"bookmarked":false,"card":null,"content":"<span class=\\\"h-card\\\"><a data-user=\\\"9qrZenwP6NX6bmyTXE\\\" class=\\\"u-url mention\\\" href=\\\"https://pl.kotobank.ch/users/vaartis\\\" rel=\\\"ugc\\\">@<span>vaartis</span></a></span> to crush your enemies, see them driven before you, and to hear the lamentation of their women","created_at":"2020-02-26T14:14:50.000Z","emojis":[],"favourited":false,"favourites_count":4,"id":"9sQqKYcbpOcHH3J5kG","in_reply_to_account_id":"9qrZenwP6NX6bmyTXE","in_reply_to_id":"9sQqIMIifJtiTyxHrU","language":null,"media_attachments":[],"mentions":[{"acct":"vaartis@pl.kotobank.ch","id":"9qrZenwP6NX6bmyTXE","url":"https://pl.kotobank.ch/users/vaartis","username":"vaartis"}],"muted":false,"pinned":false,"pleroma":{"content":{"text/plain":"@vaartis to crush your enemies, see them driven before you, and to hear the lamentation of their women"},"conversation_id":343453,"direct_conversation_id":null,"emoji_reactions":[],"expires_at":null,"in_reply_to_account_acct":"vaartis@pl.kotobank.ch","local":true,"spoiler_text":{"text/plain":""},"thread_muted":false},"poll":null,"reblog":null,"reblogged":false,"reblogs_count":0,"replies_count":1,"sensitive":false,"spoiler_text":"","tags":[],"uri":"https://lain.com/objects/1052dcd5-498e-42e5-954b-35a7a5959102","url":"https://lain.com/notice/9sQqKYcbpOcHH3J5kG","visibility":"public"}`
/* eslint-enable no-useless-escape */
/*
const makeStatus = id => {
let obj = JSON.parse(statusStr)
obj.id = id
obj.content += ` ${id}`
return obj
}
*/
const fetchTimeline = ({
timeline,
@ -558,34 +546,8 @@ const fetchTimeline = ({
const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
url += `?${queryString}`
/* */
let status = ''
let statusText = ''
/* */
/*
let data = []
let id = 50000000 + (timeline === 'publicAndExternal' ? 500000 : 0)
let max = 20
if (since) {
id = parseInt(since)
max = 20
} else if (until) {
id = parseInt(until)
}
for (let i = 1; i <= max; i++) {
let newId
if (since) {
newId = id + i
} else {
newId = id - i
}
data.push(parseStatus(makeStatus(newId.toString())))
}
url.toString()
return new Promise((resolve, reject) => { setTimeout(() => resolve(data), 1000) })
*/
return fetch(url, { headers: authHeaders(credentials) })
.then((data) => {