From f920b80e54f83f797a2c2e4fdec527ee701238c1 Mon Sep 17 00:00:00 2001
From: David Lu <david.lu@hotmail.com>
Date: Tue, 31 May 2016 05:13:43 -0700
Subject: Fixed endless scrolling up (#3156)

---
 webapp/components/sidebar.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'webapp')

diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index d20fef603..28b22fc81 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -169,6 +169,12 @@ export default class Sidebar extends React.Component {
             $('.sidebar--left .nav-pills__container').perfectScrollbar();
         }
 
+        // reset the scrollbar upon switching teams
+        if (this.state.currentTeam !== prevState.currentTeam) {
+            this.refs.container.scrollTop = 0;
+            $('.nav-pills__container').perfectScrollbar('update');
+        }
+
         // close the LHS on mobile when you change channels
         if (this.state.activeId !== prevState.activeId) {
             $('.app__body .inner-wrap').removeClass('move--right');
-- 
cgit v1.2.3-1-g7c22