diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-16 18:06:40 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-16 18:06:40 +0500 |
| commit | 0fbe63eb37b0764a106b0fdd47bc149f122b520d (patch) | |
| tree | 77cadc54d3a8d0e7812e69c50628cc7f3c5d71b7 /web/react/components/sidebar.jsx | |
| parent | b00ffa83e7371fa7dd4570130ee8b506943aee01 (diff) | |
| parent | 89716cb046ee3c8f13b361053d91149f5ce29cbf (diff) | |
| download | chat-0fbe63eb37b0764a106b0fdd47bc149f122b520d.tar.gz chat-0fbe63eb37b0764a106b0fdd47bc149f122b520d.tar.bz2 chat-0fbe63eb37b0764a106b0fdd47bc149f122b520d.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/components/sidebar.jsx')
| -rw-r--r-- | web/react/components/sidebar.jsx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 6b3dae4cd..4594555e9 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -132,11 +132,7 @@ export default class Sidebar extends React.Component { SocketStore.addChangeListener(this.onSocketChange); PreferenceStore.addChangeListener(this.onChange); - AsyncClient.getDirectChannelPreferences(); - - if ($(window).width() > 768) { - $('.nav-pills__container').perfectScrollbar(); - } + $('.nav-pills__container').perfectScrollbar(); this.updateTitle(); this.updateUnreadIndicators(); |