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

Merge pull request #1634 from clarkwinkelmann/fix-scrubber-index

Browse Source 
Fix scrubber index exceeding post count
This commit is contained in:
Toby Zerner
2018-11-12 11:40:29 +10:30
committed by GitHub
parent 8250584ba7 3d1578b89a
commit b6f37526a3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/core/js/src/forum/components/PostStreamScrubber.js
View File

@@ -99,7 +99,7 @@ export default class PostStreamScrubber extends Component {
<div className="Scrubber-bar"/> <div className="Scrubber-bar"/>
<div className="Scrubber-info"> <div className="Scrubber-info">
<strong>{viewing}</strong> <strong>{viewing}</strong>
<span class="Scrubber-description">{retain || this.description}</span> <span className="Scrubber-description">{retain || this.description}</span>
</div> </div>
</div> </div>
<div className="Scrubber-after"/> <div className="Scrubber-after"/>
@@ -132,7 +132,7 @@ export default class PostStreamScrubber extends Component {
*/ */
goToLast() { goToLast() {
this.props.stream.goToLast(); this.props.stream.goToLast();
this.index = this.props.stream.count(); this.index = this.count();
this.renderScrollbar(true); this.renderScrollbar(true);
} }
@@ -190,7 +190,6 @@ export default class PostStreamScrubber extends Component {
const marginTop = stream.getMarginTop(); const marginTop = stream.getMarginTop();
const viewportTop = scrollTop + marginTop; const viewportTop = scrollTop + marginTop;
const viewportHeight = $(window).height() - marginTop; const viewportHeight = $(window).height() - marginTop;
const viewportBottom = viewportTop + viewportHeight;
// Before looping through all of the posts, we reset the scrollbar // Before looping through all of the posts, we reset the scrollbar
// properties to a 'default' state. These values reflect what would be // properties to a 'default' state. These values reflect what would be
@@ -315,7 +314,7 @@ export default class PostStreamScrubber extends Component {
const visible = this.visible || 1; const visible = this.visible || 1;
const $scrubber = this.$(); const $scrubber = this.$();
$scrubber.find('.Scrubber-index').text(formatNumber(Math.ceil(index + visible))); $scrubber.find('.Scrubber-index').text(formatNumber(Math.min(Math.ceil(index + visible), count)));
$scrubber.find('.Scrubber-description').text(this.description); $scrubber.find('.Scrubber-description').text(this.description);
$scrubber.toggleClass('disabled', this.disabled()); $scrubber.toggleClass('disabled', this.disabled());