revert timeline changes
This commit is contained in:
parent
ce9fd04865
commit
2df48b1643
@ -12,8 +12,6 @@ library.add(
|
||||
faCog
|
||||
)
|
||||
|
||||
const scroller = () => document.getElementById('content')
|
||||
|
||||
const Timeline = {
|
||||
props: [
|
||||
'timeline',
|
||||
@ -91,7 +89,7 @@ const Timeline = {
|
||||
const credentials = store.state.users.currentUser.credentials
|
||||
const showImmediately = this.timeline.visibleStatuses.length === 0
|
||||
|
||||
scroller() && scroller().addEventListener('scroll', this.handleScroll)
|
||||
window.addEventListener('scroll', this.handleScroll)
|
||||
|
||||
if (store.state.api.fetchers[this.timelineName]) { return false }
|
||||
|
||||
@ -113,7 +111,7 @@ const Timeline = {
|
||||
setTimeout(this.determineVisibleStatuses, 250)
|
||||
},
|
||||
unmounted () {
|
||||
scroller().removeEventListener('scroll', this.handleScroll)
|
||||
window.removeEventListener('scroll', this.handleScroll)
|
||||
window.removeEventListener('keydown', this.handleShortKey)
|
||||
if (typeof document.hidden !== 'undefined') document.removeEventListener('visibilitychange', this.handleVisibilityChange, false)
|
||||
this.$store.commit('setLoading', { timeline: this.timelineName, value: false })
|
||||
@ -143,7 +141,7 @@ const Timeline = {
|
||||
this.$store.commit('showNewStatuses', { timeline: this.timelineName })
|
||||
this.paused = false
|
||||
}
|
||||
scroller().scrollTop = 0
|
||||
window.scrollTop = 0
|
||||
},
|
||||
fetchOlderStatuses: throttle(function () {
|
||||
const store = this.$store
|
||||
@ -231,8 +229,8 @@ const Timeline = {
|
||||
}
|
||||
if (count > 0) {
|
||||
// only 'stream' them when you're scrolled to the top
|
||||
const doc = document.getElementById('content')
|
||||
const top = (doc.scrollTop) - (doc.clientTop || 0)
|
||||
const doc = document.documentElement
|
||||
const top = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0)
|
||||
if (top < 15 &&
|
||||
!this.paused &&
|
||||
!(this.unfocused && this.$store.getters.mergedConfig.pauseOnUnfocused)
|
||||
|
Loading…
Reference in New Issue
Block a user