From 87f94e64e4a405459a8c6bdd0dd37d457b7c3ba4 Mon Sep 17 00:00:00 2001
From: Clark Winkelmann <clark.winkelmann@gmail.com>
Date: Sun, 11 Nov 2018 19:00:51 +0100
Subject: [PATCH 1/2] Fix scrubber index not limited to max items count when
 bypassing view()

---
 framework/core/js/src/forum/components/PostStreamScrubber.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/core/js/src/forum/components/PostStreamScrubber.js b/framework/core/js/src/forum/components/PostStreamScrubber.js
index 3bd79b89a..26b9330e5 100644
--- a/framework/core/js/src/forum/components/PostStreamScrubber.js
+++ b/framework/core/js/src/forum/components/PostStreamScrubber.js
@@ -315,7 +315,7 @@ export default class PostStreamScrubber extends Component {
     const visible = this.visible || 1;
 
     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.toggleClass('disabled', this.disabled());
 

From 3d1578b89abd20b50e9378f5d1898242cfd71f35 Mon Sep 17 00:00:00 2001
From: Clark Winkelmann <clark.winkelmann@gmail.com>
Date: Sun, 11 Nov 2018 19:03:22 +0100
Subject: [PATCH 2/2] Clean PostStreamScrubber code

---
 framework/core/js/src/forum/components/PostStreamScrubber.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/framework/core/js/src/forum/components/PostStreamScrubber.js b/framework/core/js/src/forum/components/PostStreamScrubber.js
index 26b9330e5..5d59f8fe3 100644
--- a/framework/core/js/src/forum/components/PostStreamScrubber.js
+++ b/framework/core/js/src/forum/components/PostStreamScrubber.js
@@ -99,7 +99,7 @@ export default class PostStreamScrubber extends Component {
                 <div className="Scrubber-bar"/>
                 <div className="Scrubber-info">
                   <strong>{viewing}</strong>
-                  <span class="Scrubber-description">{retain || this.description}</span>
+                  <span className="Scrubber-description">{retain || this.description}</span>
                 </div>
               </div>
               <div className="Scrubber-after"/>
@@ -132,7 +132,7 @@ export default class PostStreamScrubber extends Component {
    */
   goToLast() {
     this.props.stream.goToLast();
-    this.index = this.props.stream.count();
+    this.index = this.count();
     this.renderScrollbar(true);
   }
 
@@ -190,7 +190,6 @@ export default class PostStreamScrubber extends Component {
     const marginTop = stream.getMarginTop();
     const viewportTop = scrollTop + marginTop;
     const viewportHeight = $(window).height() - marginTop;
-    const viewportBottom = viewportTop + viewportHeight;
 
     // Before looping through all of the posts, we reset the scrollbar
     // properties to a 'default' state. These values reflect what would be