mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-07 08:56:38 +02:00
Code Issues Releases Wiki Activity

Ensure consistent index in scrubber, rework current post index calculation logic.

Browse Source
This commit is contained in:
Alexander Skvortsov
2020-07-06 23:30:31 -04:00
committed by Franz Liedke
parent 0c63be527b
commit aa15db6f44
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
js/src/forum/components/PostStream.js
View File

@@ -136,9 +136,7 @@ export default class PostStream extends Component {
* @param {Integer} top
*/
onscroll(top = window.pageYOffset) {
console.log('scrolling');
if (this.state.paused) return;
console.log('scrolling and unpaused');
const marginTop = this.getMarginTop();
const viewportHeight = $(window).height() - marginTop;
const viewportTop = top + marginTop;
@@ -178,7 +176,7 @@ export default class PostStream extends Component {
// seen if the browser were scrolled right up to the top of the page,
// and the viewport had a height of 0.
const $items = this.$('.PostStream-item[data-index]');
let index = $items.first().data('index') || 0;
let index = null;
let visible = 0;
let period = '';
@@ -206,7 +204,9 @@ export default class PostStream extends Component {
const visibleBottom = Math.min(height, viewportTop + viewportHeight - top);
const visiblePost = visibleBottom - visibleTop;
if (top <= viewportTop) {
const threeQuartersVisible = visibleTop / height < 0.75;
const coversQuarterOfViewport = (height - visibleTop) / viewportHeight > 0.25;
if (index === null && (threeQuartersVisible || coversQuarterOfViewport)) {
index = parseFloat($this.data('index')) + visibleTop / height;
}
@@ -220,6 +220,8 @@ export default class PostStream extends Component {
if (time) period = time;
});
console.log(index);
const indexChanged = Math.floor(this.state.index) != Math.floor(index);
this.state.index = index;
this.state.visible = visible;
@@ -340,12 +342,15 @@ export default class PostStream extends Component {
}
return $container.promise().then(() => {
this.state.loadPromise.then(() => {
anchorScroll(`.PostStream-item[data-index=${$item.data('index')}]`, () => m.redraw(true));
});
this.state.unpause();
this.calculatePosition();
this.updateScrubber();
this.state.loadPromise
.then(() => {
anchorScroll(`.PostStream-item[data-index=${$item.data('index')}]`, () => m.redraw(true));
})
.then(() => {
this.calculatePosition();
if (this.state.locationType == 'number') this.updateScrubber();
})
.then(() => this.state.unpause());
});
}

2
js/src/forum/components/PostStreamScrubber.js
View File

@@ -25,7 +25,7 @@ export default class PostStreamScrubber extends Component {
const unreadPercent = count ? Math.min(count - this.state.index, unreadCount) / count : 0;
const viewing = app.translator.transChoice('core.forum.post_scrubber.viewing_text', count, {
index: <span className="Scrubber-index">{formatNumber(this.state.sanitizeIndex(index + this.state.visible))}</span>,
index: <span className="Scrubber-index">{formatNumber(this.state.sanitizeIndex(index + 1))}</span>,
count: <span className="Scrubber-count">{formatNumber(count)}</span>,
});