github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-18 12:18:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Without suggested topics jumping to a post had the wrong offset

Browse Source
This commit is contained in:
Robin Ward 2017-04-24 13:21:50 -04:00
parent df77a827e1
commit 4e1f8ec72b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/lib/offset-calculator.js.es6
View File

@ -33,12 +33,11 @@ export default function offsetCalculator(y) {
} }
if (inter > ideal) { if (inter > ideal) {
const bottom = $('#topic-bottom').offset().top; const bottom = $('#topic-bottom').offset().top;
const switchPos = bottom - rawWinHeight; const switchPos = bottom - rawWinHeight;
if (scrollTop > switchPos) { if (scrollTop > switchPos) {
const p = Math.max(Math.min((scrollTop + inter - switchPos) / rawWinHeight, 1.0), 0.0); const p = Math.max(Math.min((scrollTop + inter - switchPos) / bottom, 1.0), 0.0);
return ((1 - p) * ideal) + (p * inter); return ((1 - p) * ideal) + (p * inter);
} else { } else {
return ideal; return ideal;