IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Timeline issues on sites with large headers

Browse Source
This commit is contained in:
Robin Ward
2016-06-03 17:19:06 -04:00
parent ee6cd3e4c4
commit 0f0bff3786
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,15 +18,13 @@ export default MountWidget.extend(Docking, {
dockBottom: this.dockBottom };
},
@observes('topic.highest_post_number')
@observes('topic.highest_post_number', 'loading')
newPostAdded() {
this.queueRerender(() => this.queueDockCheck());
},
dockCheck(info) {
if (this.get('loading')) { return; }
const topicTop = $('.container.posts').offset().top;
const topicTop = $('.container.posts').offset().top - $('#main').offset().top;
const topicBottom = $('#topic-bottom').offset().top;
const $timeline = this.$('.timeline-container');
const timelineHeight = $timeline.height() || 400;

2
app/assets/javascripts/discourse/mixins/docking.js.es6
View File

@@ -1,5 +1,5 @@
const helper = {
offset: () => window.pageYOffset || $('html').scrollTop()
offset: () => (window.pageYOffset || $('html').scrollTop()) - $('#main').offset().top
};
export default Ember.Mixin.create({