summaryrefslogtreecommitdiffstats
path: root/webapp/routes
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-11-24 09:08:46 -0500
committerChristopher Speller <crspeller@gmail.com>2016-11-24 09:08:46 -0500
commitc96ecae6da31aceabf29586cde872876b81d11d9 (patch)
tree94df09df540da846bb4c6ed50e8bd7879cff63ba /webapp/routes
parentb212acf312ad640455fa715427ac19e6930dc61d (diff)
parent36f62c9e82350f58c902f64a5d3304872431ad41 (diff)
downloadchat-c96ecae6da31aceabf29586cde872876b81d11d9.tar.gz
chat-c96ecae6da31aceabf29586cde872876b81d11d9.tar.bz2
chat-c96ecae6da31aceabf29586cde872876b81d11d9.zip
Merge branch 'release-3.5'
Diffstat (limited to 'webapp/routes')
-rw-r--r--webapp/routes/route_team.jsx9
1 files changed, 6 insertions, 3 deletions
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx
index 4bdfd1cc6..7d4c0c80c 100644
--- a/webapp/routes/route_team.jsx
+++ b/webapp/routes/route_team.jsx
@@ -29,13 +29,16 @@ function doChannelChange(state, replace, callback) {
channel = JSON.parse(state.location.query.fakechannel);
} else {
channel = ChannelStore.getByName(state.params.channel);
- if (!channel) {
- channel = ChannelStore.getMoreByName(state.params.channel);
- }
+
if (!channel) {
Client.joinChannelByName(
state.params.channel,
(data) => {
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.RECEIVED_CHANNEL,
+ channel: data
+ });
+
GlobalActions.emitChannelClickEvent(data);
callback();
},