summaryrefslogtreecommitdiffstats
path: root/web/react/components/more_direct_channels.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-13 14:15:32 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-13 14:15:32 -0500
commitf0b1adf6cfaf0f2825b514d2c5e132ebf583652b (patch)
tree0bdb4439993b44f7106436b23e7ee015093b1769 /web/react/components/more_direct_channels.jsx
parentc5c96082c5b076d4776e18503d9317cdaeb6066c (diff)
parentcd82de18f5c47f1dcc0e6e31af9d17c1ff0b1136 (diff)
downloadchat-f0b1adf6cfaf0f2825b514d2c5e132ebf583652b.tar.gz
chat-f0b1adf6cfaf0f2825b514d2c5e132ebf583652b.tar.bz2
chat-f0b1adf6cfaf0f2825b514d2c5e132ebf583652b.zip
Merge release branch 'release-1.2'
Diffstat (limited to 'web/react/components/more_direct_channels.jsx')
-rw-r--r--web/react/components/more_direct_channels.jsx4
1 files changed, 4 insertions, 0 deletions
diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index 40deb37f2..d1265f67e 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -50,6 +50,10 @@ export default class MoreDirectChannels extends React.Component {
handleFilterChange() {
const filter = ReactDOM.findDOMNode(this.refs.filter).value;
+ if ($(window).width() > 768) {
+ $(ReactDOM.findDOMNode(this.refs.userList)).scrollTop(0);
+ }
+
if (filter !== this.state.filter) {
this.setState({filter});
}