Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Don't dock the timeline when loading

This commit is contained in:
Robin Ward 2016-05-19 13:15:12 -04:00
parent 5901faa643
commit 18ffa6e98b
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/topic-timeline.js.es6
View File

@ -12,6 +12,8 @@ export default MountWidget.extend(Docking, {
}, },
dockCheck(info) { dockCheck(info) {
if (this.get('loading')) { return; }
const topicBottom = $('#topic-bottom').offset().top; const topicBottom = $('#topic-bottom').offset().top;
const $timeline = this.$('.timeline-container'); const $timeline = this.$('.timeline-container');
const timelineHeight = $timeline.height(); const timelineHeight = $timeline.height();

1
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -73,6 +73,7 @@
{{#if showTimeline}} {{#if showTimeline}}
{{topic-timeline topic=model {{topic-timeline topic=model
loading=model.postStream.loading
jumpTop="jumpTop" jumpTop="jumpTop"
jumpToPost="jumpToPost" jumpToPost="jumpToPost"
jumpBottom="jumpBottom" jumpBottom="jumpBottom"