s0ulf3re/akkoma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adjust scrolling logic and document it, make sure to never show 'show less' if it's not a tall status

Browse source
This commit is contained in:
shpuld 2019-01-30 16:38:28 +02:00
parent 3cfbf0141f
commit 0a39159fdf
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/status/status.js
View file

@ -179,7 +179,7 @@ const Status = {
return this.tallStatus return this.tallStatus
}, },
showingMore () { showingMore () {
return this.showingTall || (this.status.summary && this.expandingSubject) return (this.tallStatus && this.showingTall) || (this.status.summary && this.expandingSubject)
}, },
nsfwClickthrough () { nsfwClickthrough () {
if (!this.status.nsfw) { if (!this.status.nsfw) {
@ -303,11 +303,14 @@ const Status = {
'highlight': function (id) { 'highlight': function (id) {
if (this.status.id === id) { if (this.status.id === id) {
let rect = this.$el.getBoundingClientRect() let rect = this.$el.getBoundingClientRect()
if (rect.top < 140) { if (rect.top < 100) {
window.scrollBy(0, rect.top - 200) // Post is above screen, match its top to screen top
} else if (rect.top < window.innerHeight && rect.height >= (window.innerHeight - 50)) { window.scrollBy(0, rect.top - 100)
window.scrollBy(0, rect.top - 50) } else if (rect.height >= (window.innerHeight - 50)) {
// Post we want to see is taller than screen so match its top to screen top
window.scrollBy(0, rect.top - 100)
} else if (rect.bottom > window.innerHeight - 50) { } else if (rect.bottom > window.innerHeight - 50) {
// Post is below screen, match its bottom to screen bottom
window.scrollBy(0, rect.bottom - window.innerHeight + 50) window.scrollBy(0, rect.bottom - window.innerHeight + 50)
} }
} }