moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

* origin/develop:
  Fix virtual scrolling when the user has a lot of pinned statuses
  fix "allow discovery" setting misbehaving
This commit is contained in:
Henry Jameson 2022-05-20 12:45:06 +03:00
parent c83657a072 c93adf2e9a
commit 2c876f455a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/timeline/timeline.js
View File

@ -77,8 +77,9 @@ const Timeline = {
statusesToDisplay () {
const amount = this.timeline.visibleStatuses.length
const statusesPerSide = Math.ceil(Math.max(3, window.innerHeight / 80))
const min = Math.max(0, this.virtualScrollIndex - statusesPerSide)
const max = Math.min(amount, this.virtualScrollIndex + statusesPerSide)
const nonPinnedIndex = this.virtualScrollIndex - this.filteredPinnedStatusIds.length
const min = Math.max(0, nonPinnedIndex - statusesPerSide)
const max = Math.min(amount, nonPinnedIndex + statusesPerSide)
return this.timeline.visibleStatuses.slice(min, max).map(_ => _.id)
},
virtualScrollingEnabled () {

5
src/modules/serverSideConfig.js
View File

@ -55,7 +55,10 @@ export const settingsMap = {
get: 'pleroma.allow_following_move',
set: 'allow_following_move'
},
'discoverable': 'source.discoverable',
'discoverable': {
get: 'source.pleroma.discoverable',
set: 'discoverable'
},
'hideFavorites': {
get: 'pleroma.hide_favorites',
set: 'hide_favorites'