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

FIX: Scrolling to the bottom was still a bit weird with no suggested

Browse Source
This commit is contained in:
Robin Ward 2017-04-24 16:36:20 -04:00
parent 29ddb3a611
commit f41ab98e86
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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