diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
| commit | 8fb66c2b834ee4e0669de173e5ddfebd56c34d58 (patch) | |
| tree | 9e8e66772d44c4f9010a48c8e0afed70421238b1 /webapp/actions | |
| parent | 4208e42ba9df02b9c4bd7081179922c21206d83d (diff) | |
| parent | aafb8be87c79c60df7534b3b69f967c6301b157e (diff) | |
| download | chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.gz chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.bz2 chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.zip | |
Merge branch 'release-3.6'
Diffstat (limited to 'webapp/actions')
| -rw-r--r-- | webapp/actions/global_actions.jsx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index c6b796983..ea077d6eb 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -55,6 +55,10 @@ export function emitChannelClickEvent(channel) { trackPage(); }); + // Mark previous and next channel as read + ChannelStore.resetCounts(ChannelStore.getCurrentId()); + ChannelStore.resetCounts(chan.id); + BrowserStore.setGlobalItem(chan.team_id, chan.id); AppDispatcher.handleViewAction({ @@ -487,10 +491,9 @@ export function clientLogout(redirectTo = '/') { UserStore.clear(); TeamStore.clear(); ChannelStore.clear(); - newLocalizationSelected(global.window.mm_config.DefaultClientLocale); stopPeriodicStatusUpdates(); WebsocketActions.close(); - browserHistory.push(redirectTo); + window.location.href = redirectTo; } export function emitSearchMentionsEvent(user) { |