copyleftie
/
pinafore
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix timelineType state read (#310)

This commit is contained in:
Nolan Lawson 2018-05-18 18:33:20 -07:00 committed by GitHub
parent 408650f399
commit a51477b501
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
routes/_components/timeline/Timeline.html
View File

@ -169,7 +169,7 @@
this.set({scrollTop: scrollTop}) this.set({scrollTop: scrollTop})
}, },
onScrollToBottom () { onScrollToBottom () {
let { timelineType } = this.store.get() let { timelineType } = this.get()
let { timelineInitialized, runningUpdate } = this.store.get() let { timelineInitialized, runningUpdate } = this.store.get()
if (!timelineInitialized || if (!timelineInitialized ||
runningUpdate || runningUpdate ||
@ -194,7 +194,7 @@
}, },
setupStreaming () { setupStreaming () {
let { currentInstance } = this.store.get() let { currentInstance } = this.store.get()
let { timeline } = this.get() let { timeline, timelineType } = this.get()
let handleItemIdsToAdd = () => { let handleItemIdsToAdd = () => {
let { itemIdsToAdd } = this.get() let { itemIdsToAdd } = this.get()
if (!itemIdsToAdd || !itemIdsToAdd.length) { if (!itemIdsToAdd || !itemIdsToAdd.length) {
@ -206,7 +206,7 @@
shouldShowHeader, shouldShowHeader,
showHeader showHeader
} = this.store.get() } = this.store.get()
if (timeline.startsWith('status/')) { if (timelineType === 'status') {
// this is a thread, just insert the statuses already // this is a thread, just insert the statuses already
showMoreItemsForThread(currentInstance, timeline) showMoreItemsForThread(currentInstance, timeline)
} else if (scrollTop === 0 && !shouldShowHeader && !showHeader) { } else if (scrollTop === 0 && !shouldShowHeader && !showHeader) {