hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into shigusegubu

Browse source 
* origin/develop: (28 commits)
  Update CHANGELOG.md
  don't dismiss a rejected follow request on server
  mark single notifs as seen properly on server
  follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view
  Add support for follow request notifications
  Update CHANGELOG.md
  Update CHANGELOG.md
  Prioritize custom emoji a lot and boost exact matches to the top
  Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting
  Refactor status showing/hiding code for better handling of edge cases and easier comprehension
  Fix user names with the RTL char in notifications
  Fix pagination
  Update CHANGELOG.md
  don't dismiss a rejected follow request on server
  mark single notifs as seen properly on server
  follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view
  Update CHANGELOG.md
  remove with_move param
  Add support for follow request notifications
  Update CHANGELOG.md
  ...
This commit is contained in:
Henry Jameson 2020-05-02 19:53:41 +03:00
commit b5afffdac4
16 changed files with 574 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -189,23 +189,22 @@ const Status = {
}
return this.status.attentions.length > 0
},
// When a status has a subject and is also tall, we should only have one show more/less button. If the default is to collapse statuses with subjects, we just treat it like a status with a subject; otherwise, we just treat it like a tall status.
mightHideBecauseSubject () {
return this.status.summary && (!this.tallStatus || this.localCollapseSubjectDefault)
},
mightHideBecauseTall () {
return this.tallStatus && (!this.status.summary || !this.localCollapseSubjectDefault)
},
hideSubjectStatus () {
if (this.tallStatus && !this.localCollapseSubjectDefault) {
return false
}
return !this.expandingSubject && this.status.summary
return this.mightHideBecauseSubject && !this.expandingSubject
},
hideTallStatus () {
if (this.status.summary && this.localCollapseSubjectDefault) {
return false
}
if (this.showingTall) {
return false
}
return this.tallStatus
return this.mightHideBecauseTall && !this.showingTall
},
showingMore () {
return (this.tallStatus && this.showingTall) || (this.status.summary && this.expandingSubject)
return (this.mightHideBecauseTall && this.showingTall) || (this.mightHideBecauseSubject && this.expandingSubject)
},
nsfwClickthrough () {
if (!this.status.nsfw) {
@ -409,14 +408,10 @@ const Status = {
this.userExpanded = !this.userExpanded
},
toggleShowMore () {
if (this.showingTall) {
this.showingTall = false
} else if (this.expandingSubject && this.status.summary) {
this.expandingSubject = false
} else if (this.hideTallStatus) {
this.showingTall = true
} else if (this.hideSubjectStatus && this.status.summary) {
this.expandingSubject = true
if (this.mightHideBecauseTall) {
this.showingTall = !this.showingTall
} else if (this.mightHideBecauseSubject) {
this.expandingSubject = !this.expandingSubject
}
},
generateUserProfileLink (id, name) {