summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-11-04 11:59:27 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-11-04 11:59:27 -0400
commitaa9e09c6740526730e44be766bcdf538f3fc2d5f (patch)
treebf0d89b3ccc118908be3fe612a2fad3d89a7dff1
parente6f7a47c99075a39d862308659b904bfaf64a11a (diff)
downloadchat-aa9e09c6740526730e44be766bcdf538f3fc2d5f.tar.gz
chat-aa9e09c6740526730e44be766bcdf538f3fc2d5f.tar.bz2
chat-aa9e09c6740526730e44be766bcdf538f3fc2d5f.zip
Adding favourite channels to ALT and ALT-SHIFT UP DOWN shortcuts (#4450)
-rw-r--r--webapp/components/sidebar.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index 08f89c2ff..626ac2866 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -309,7 +309,7 @@ export default class Sidebar extends React.Component {
}
getDisplayedChannels() {
- return this.state.publicChannels.concat(this.state.privateChannels).concat(this.state.directChannels).concat(this.state.directNonTeamChannels);
+ return this.state.favoriteChannels.concat(this.state.publicChannels).concat(this.state.privateChannels).concat(this.state.directChannels).concat(this.state.directNonTeamChannels);
}
handleLeaveDirectChannel(e, channel) {