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

FIX: We can show the back button near the bottom

This commit is contained in:
Robin Ward 2016-12-27 10:21:30 -05:00
parent 49dda1e025
commit ee0c41b53a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/widgets/topic-timeline.js.es6
View File

@ -7,6 +7,7 @@ import RawHtml from 'discourse/widgets/raw-html';
const SCROLLAREA_HEIGHT = 300; const SCROLLAREA_HEIGHT = 300;
const SCROLLER_HEIGHT = 50; const SCROLLER_HEIGHT = 50;
const SCROLLAREA_REMAINING = SCROLLAREA_HEIGHT - SCROLLER_HEIGHT; const SCROLLAREA_REMAINING = SCROLLAREA_HEIGHT - SCROLLER_HEIGHT;
const LAST_READ_HEIGHT = 20;
function clamp(p, min=0.0, max=1.0) { function clamp(p, min=0.0, max=1.0) {
return Math.max(Math.min(p, max), min); return Math.max(Math.min(p, max), min);
@ -25,9 +26,9 @@ createWidget('timeline-last-read', {
tagName: 'div.timeline-last-read', tagName: 'div.timeline-last-read',
buildAttributes(attrs) { buildAttributes(attrs) {
const bottom = SCROLLAREA_HEIGHT - 10; const bottom = SCROLLAREA_HEIGHT - (LAST_READ_HEIGHT / 2);
const top = attrs.top > bottom ? bottom : attrs.top; const top = attrs.top > bottom ? bottom : attrs.top;
return { style: `height: 20px; top: ${top}px` }; return { style: `height: ${LAST_READ_HEIGHT}px; top: ${top}px` };
}, },
html(attrs) { html(attrs) {
@ -184,10 +185,9 @@ createWidget('timeline-scrollarea', {
// Don't show if at the bottom of the timeline // Don't show if at the bottom of the timeline
if (lastReadTop > (SCROLLAREA_HEIGHT - SCROLLER_HEIGHT)) { if (lastReadTop > (SCROLLAREA_HEIGHT - (LAST_READ_HEIGHT / 2))) {
showButton = false; showButton = false;
} }
} }
const result = [ const result = [