diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-05 16:02:09 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-05 16:02:09 -0400 |
| commit | e2e00d9d43c14806cd5a5c424b9879636dfd89c8 (patch) | |
| tree | 607e55539a4827382bfdc331400885fdd073922c /web/react/components/sidebar_right.jsx | |
| parent | 193732ffbf1107fd146412ce38a053354d972e25 (diff) | |
| parent | 33b957ed1a8a44d4bed0f9c674d5602bad5028ea (diff) | |
| download | chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.tar.gz chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.tar.bz2 chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.zip | |
Merge pull request #922 from mattermost/plt-360
PLT-360 Upgrade and changes to ESLint
Diffstat (limited to 'web/react/components/sidebar_right.jsx')
| -rw-r--r-- | web/react/components/sidebar_right.jsx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/react/components/sidebar_right.jsx b/web/react/components/sidebar_right.jsx index 708cd04cb..573515a46 100644 --- a/web/react/components/sidebar_right.jsx +++ b/web/react/components/sidebar_right.jsx @@ -30,11 +30,11 @@ export default class SidebarRight extends React.Component { PostStore.removeSelectedPostChangeListener(this.onSelectedChange); } componentDidUpdate() { - if (!this.plScrolledToBottom) { - $('.top-visible-post')[0].scrollIntoView(); - } else { + if (this.plScrolledToBottom) { var postHolder = $('.post-list-holder-by-time').not('.inactive'); postHolder.scrollTop(postHolder[0].scrollHeight); + } else { + $('.top-visible-post')[0].scrollIntoView(); } } onSelectedChange(fromSearch) { |