diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-09-30 19:30:45 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-09-30 19:30:45 +0500 |
| commit | 296b93076888c9b26329938bd1cf1587397c7f51 (patch) | |
| tree | a37a396752971c88e13fc97d88531357ca09542e /web/react/components/sidebar_right.jsx | |
| parent | fb285d7b32a6c5e559277bcb32b3b7ff6889af22 (diff) | |
| parent | 13ebb5fe94bfee4e529f634f02d285fa7d8c0dfc (diff) | |
| download | chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.gz chat-296b93076888c9b26329938bd1cf1587397c7f51.tar.bz2 chat-296b93076888c9b26329938bd1cf1587397c7f51.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into plt-383
Diffstat (limited to 'web/react/components/sidebar_right.jsx')
| -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; |