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

Merge branch 'fix/stop-inappropriate-scroll-auto-fetch' into 'develop'

Browse source 
Stop inappropriate auto fetching on scroll

See merge request pleroma/pleroma-fe!123
This commit is contained in:
lambda 2017-11-02 14:59:31 +00:00
commit fb8b625d9a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ const Timeline = {
const credentials = store.state.users.currentUser.credentials const credentials = store.state.users.currentUser.credentials
const showImmediately = this.timeline.visibleStatuses.length === 0 const showImmediately = this.timeline.visibleStatuses.length === 0
window.onscroll = this.scrollLoad window.addEventListener('scroll', this.scrollLoad)
timelineFetcher.fetchAndUpdate({ timelineFetcher.fetchAndUpdate({
store, store,
@ -50,6 +50,9 @@ const Timeline = {
this.fetchFollowers() this.fetchFollowers()
} }
}, },
destroyed () {
window.removeEventListener('scroll', this.scrollLoad)
},
methods: { methods: {
showNewStatuses () { showNewStatuses () {
this.$store.commit('showNewStatuses', { timeline: this.timelineName }) this.$store.commit('showNewStatuses', { timeline: this.timelineName })
@ -80,7 +83,10 @@ const Timeline = {
}, },
scrollLoad (e) { scrollLoad (e) {
let height = Math.max(document.body.offsetHeight, document.body.scrollHeight) let height = Math.max(document.body.offsetHeight, document.body.scrollHeight)
if (this.timeline.loading === false && this.$store.state.config.autoLoad && (window.innerHeight + window.pageYOffset) >= (height - 750)) { if (this.timeline.loading === false &&
this.$store.state.config.autoLoad &&
this.$el.offsetHeight > 0 &&
(window.innerHeight + window.pageYOffset) >= (height - 750)) {
this.fetchOlderStatuses() this.fetchOlderStatuses()
} }
} }