Skip to content
Snippets Groups Projects
Commit 2df48b16 authored by HJ's avatar HJ :fire:
Browse files

revert timeline changes

parent ce9fd048
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment