summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-08-07 10:54:13 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-08-07 10:54:13 -0400
commit5b831e78a79dba6f8dbea91c0cc2ba0b9253eb15 (patch)
tree5f3c7969cea59d788a8d0d995a7fae66e02b8f30 /web
parent02eabee792a1bb220c8fac400ac6b80486d1d954 (diff)
downloadchat-5b831e78a79dba6f8dbea91c0cc2ba0b9253eb15.tar.gz
chat-5b831e78a79dba6f8dbea91c0cc2ba0b9253eb15.tar.bz2
chat-5b831e78a79dba6f8dbea91c0cc2ba0b9253eb15.zip
Changed sidebar scroll handler to use React's onScroll
Diffstat (limited to 'web')
-rw-r--r--web/react/components/sidebar.jsx6
1 files changed, 1 insertions, 5 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 82a14915c..5ce9e5d02 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -133,16 +133,12 @@ module.exports = React.createClass({
this.updateTitle();
this.updateUnreadIndicators();
-
- $('.nav-pills__container').on('scroll', this.onScroll);
},
componentDidUpdate: function() {
this.updateTitle();
this.updateUnreadIndicators();
},
componentWillUnmount: function() {
- $('.nav-pills__container').off('scroll', this.onScroll);
-
ChannelStore.removeChangeListener(this.onChange);
UserStore.removeChangeListener(this.onChange);
UserStore.removeStatusesChangeListener(this.onChange);
@@ -416,7 +412,7 @@ module.exports = React.createClass({
<div ref='topUnreadIndicator' className='nav-pills__unread-indicator nav-pills__unread-indicator-top' style={{display: 'none'}}>Unread post(s) above</div>
<div ref='bottomUnreadIndicator' className='nav-pills__unread-indicator nav-pills__unread-indicator-bottom' style={{display: 'none'}}>Unread post(s) below</div>
- <div ref='container' className='nav-pills__container'>
+ <div ref='container' className='nav-pills__container' onScroll={this.onScroll}>
<ul className='nav nav-pills nav-stacked'>
<li><h4>Channels<a className='add-channel-btn' href='#' data-toggle='modal' data-target='#new_channel' data-channeltype='O'>+</a></h4></li>
{channelItems}