diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-16 09:12:30 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-16 09:12:30 -0700 |
| commit | 8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73 (patch) | |
| tree | 84e426d92eccf017f0fd5ccd22815a2139bd6e44 /web/react/components/sidebar.jsx | |
| parent | 6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2 (diff) | |
| parent | 9c045f0d4bdf254f57b94356fd2f5f2a2408ed03 (diff) | |
| download | chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.tar.gz chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.tar.bz2 chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.zip | |
Fixing merge
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 5561c5b73..2c98db7f3 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(); |