codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-03-25 06:11:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: On small heights jumping to posts was iffy

Browse source
This commit is contained in:
Robin Ward 2016-05-30 17:33:40 -04:00
parent 5fc47e6942
commit d2ebf0436c
No known key found for this signature in database
GPG key ID: 0E091E2B4ED1B83D
1 changed files with 10 additions and 3 deletions

13
app/assets/javascripts/discourse/lib/offset-calculator.js.es6
View file

@ -13,8 +13,10 @@ export default function offsetCalculator(y) {
const $title = $('#topic-title');
const rawWinHeight = $(window).height();
const windowHeight = rawWinHeight - $title.height();
const expectedOffset = $title.height() - $header.find('.contents').height() + (windowHeight / 5);
const ideal = $header.outerHeight(true) + ((expectedOffset < 0) ? 0 : expectedOffset);
const eyeTarget = (windowHeight / 10);
const headerHeight = $header.outerHeight(true);
const expectedOffset = $title.height() - $header.find('.contents').height() + (eyeTarget * 2);
const ideal = headerHeight + ((expectedOffset < 0) ? 0 : expectedOffset);
const $container = $('.posts-wrapper');
const topPos = $container.offset().top;
@ -23,7 +25,12 @@ export default function offsetCalculator(y) {
const docHeight = $(document).height();
const scrollPercent = (scrollTop / (docHeight-rawWinHeight));
const inter = topPos - scrollTop + ($container.height() * scrollPercent);
let inter = topPos - scrollTop + ($container.height() * scrollPercent);
if (inter < headerHeight + eyeTarget) {
inter = headerHeight + eyeTarget;
}
if (inter > ideal) {
const bottom = $('#topic-bottom').offset().top;