FIX: Don't dock the timeline when loading

2016-05-19 13:15:12 -04:00 · 2016-05-19 13:15:12 -04:00 · 18ffa6e98b
parent 5901faa643
commit 18ffa6e98b
2 changed files with 3 additions and 0 deletions
--- a/app/assets/javascripts/discourse/components/topic-timeline.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-timeline.js.es6
@ -12,6 +12,8 @@ export default MountWidget.extend(Docking, {
  },

  dockCheck(info) {
+    if (this.get('loading')) { return; }
+
    const topicBottom = $('#topic-bottom').offset().top;
    const $timeline = this.$('.timeline-container');
    const timelineHeight = $timeline.height();
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@ -73,6 +73,7 @@

          {{#if showTimeline}}
            {{topic-timeline topic=model
+                             loading=model.postStream.loading
                             jumpTop="jumpTop"
                             jumpToPost="jumpToPost"
                             jumpBottom="jumpBottom"