diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-09-30 08:14:54 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-09-30 08:14:54 -0400 |
| commit | 13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc (patch) | |
| tree | 0e155a0ef66a45354975bf65bd507a83d62a9ff1 /web | |
| parent | 73627000e7a14d87d8292e229163f072712ff0f6 (diff) | |
| parent | 95b4d63d3f26f5fa9fea2dfad57cdfd66edaa909 (diff) | |
| download | chat-13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc.tar.gz chat-13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc.tar.bz2 chat-13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc.zip | |
Merge pull request #875 from mattermost/rhs-scroll-fix
Fix RHS scrolling center pane.
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/sidebar_right.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/sidebar_right.jsx b/web/react/components/sidebar_right.jsx index e63418ae8..708cd04cb 100644 --- a/web/react/components/sidebar_right.jsx +++ b/web/react/components/sidebar_right.jsx @@ -33,7 +33,7 @@ export default class SidebarRight extends React.Component { if (!this.plScrolledToBottom) { $('.top-visible-post')[0].scrollIntoView(); } else { - var postHolder = $('.post-list-holder-by-time'); + var postHolder = $('.post-list-holder-by-time').not('.inactive'); postHolder.scrollTop(postHolder[0].scrollHeight); } } @@ -51,7 +51,7 @@ export default class SidebarRight extends React.Component { } } render() { - var postHolder = $('.post-list-holder-by-time'); + var postHolder = $('.post-list-holder-by-time').not('.inactive'); const position = postHolder.scrollTop() + postHolder.height() + 14; const bottom = postHolder[0].scrollHeight; this.plScrolledToBottom = position >= bottom; |