AkkomaGang/akkoma-fe
5
13
Fork 64
Code Issues 81 Pull requests 19 Projects Releases 1 Wiki Activity

Merge branch 'fix/tall-status-handling' into 'develop'

Browse source 
Tall status fixes/improvements

See merge request pleroma/pleroma-fe!490
This commit is contained in:
lambda 2019-01-28 20:09:40 +00:00
commit de91998317
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ const Status = {
userExpanded: false, userExpanded: false,
preview: null, preview: null,
showPreview: false, showPreview: false,
showingTall: false, showingTall: this.inConversation && this.focused,
expandingSubject: typeof this.$store.state.config.collapseMessageWithSubject === 'undefined' expandingSubject: typeof this.$store.state.config.collapseMessageWithSubject === 'undefined'
? !this.$store.state.instance.collapseMessageWithSubject ? !this.$store.state.instance.collapseMessageWithSubject
: !this.$store.state.config.collapseMessageWithSubject, : !this.$store.state.config.collapseMessageWithSubject,
@ -264,11 +264,11 @@ const Status = {
toggleShowMore () { toggleShowMore () {
if (this.showingTall) { if (this.showingTall) {
this.showingTall = false this.showingTall = false
} else if (this.expandingSubject) { } else if (this.expandingSubject && this.status.summary) {
this.expandingSubject = false this.expandingSubject = false
} else if (this.hideTallStatus) { } else if (this.hideTallStatus) {
this.showingTall = true this.showingTall = true
} else if (this.hideSubjectStatus) { } else if (this.hideSubjectStatus && this.status.summary) {
this.expandingSubject = true this.expandingSubject = true
} }
}, },
@ -301,8 +301,10 @@ 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 < 100) { if (rect.top < 140) {
window.scrollBy(0, rect.top - 200) window.scrollBy(0, rect.top - 200)
} else if (rect.top < window.innerHeight && rect.height >= (window.innerHeight - 50)) {
window.scrollBy(0, rect.top - 50)
} else if (rect.bottom > window.innerHeight - 50) { } else if (rect.bottom > window.innerHeight - 50) {
window.scrollBy(0, rect.bottom - window.innerHeight + 50) window.scrollBy(0, rect.bottom - window.innerHeight + 50)
} }