From b79ce19aea91c2846aea2d35487d5ab9a79597e6 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 6 Jan 2017 09:00:30 -0500 Subject: Temporary fix for JS errors when logging out with non-english language (#4990) --- webapp/actions/global_actions.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'webapp/actions') diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index c6b796983..8542a0c92 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -487,10 +487,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) { -- cgit v1.2.3-1-g7c22 From 04893cbe7cf97c9ed820fc85a4d32ef61efce558 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Tue, 10 Jan 2017 16:17:22 -0500 Subject: Reset unread counts for channels being switched to/away (#5037) --- webapp/actions/global_actions.jsx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'webapp/actions') diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index 8542a0c92..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({ -- cgit v1.2.3-1-g7c22