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

FIX: First time switching to docked was placing it in the wrong pos

This commit is contained in:
Robin Ward 2016-05-19 12:42:54 -04:00
parent fa2bffd618
commit 9e39474ef9
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,13 +15,14 @@ export default MountWidget.extend(Docking, {
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();
const parentTop = $('.posts-wrapper').offset().top;
const tTop = 140; const tTop = 140;
const prev = this.dockAt; const prev = this.dockAt;
const pos = tTop + info.offset() + timelineHeight; const pos = tTop + info.offset() + timelineHeight;
if (pos > topicBottom) { if (pos > topicBottom) {
this.dockAt = topicBottom - timelineHeight - $timeline.offsetParent().offset().top; this.dockAt = topicBottom - timelineHeight - parentTop;
} else { } else {
this.dockAt = null; this.dockAt = null;
} }