diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-03-30 11:16:33 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-03-30 11:16:33 -0400 |
commit | d2ddddc4aaf1e085c7f02d86d957fe571c70978a (patch) | |
tree | 01efcedc9ca98c333c082ac652bff68ce0ad3f8e /webapp/components | |
parent | 4cc7b29c9288321d95ee753b767c9cd0b529f52f (diff) | |
parent | 29cc5e16bc397ddca4f7740eb6fa25dc74960d0d (diff) | |
download | chat-d2ddddc4aaf1e085c7f02d86d957fe571c70978a.tar.gz chat-d2ddddc4aaf1e085c7f02d86d957fe571c70978a.tar.bz2 chat-d2ddddc4aaf1e085c7f02d86d957fe571c70978a.zip |
Merge pull request #2573 from mattermost/plt-2453
PLT-2453 Resetting theme upon logout.
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/logged_in.jsx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx index fd09aac9e..f7a6be647 100644 --- a/webapp/components/logged_in.jsx +++ b/webapp/components/logged_in.jsx @@ -14,6 +14,7 @@ const TutorialSteps = Constants.TutorialSteps; const Preferences = Constants.Preferences; import ErrorBar from 'components/error_bar.jsx'; import * as Websockets from 'action_creators/websocket_actions.jsx'; +import LoadingScreen from 'components/loading_screen.jsx'; import {browserHistory} from 'react-router'; @@ -44,6 +45,13 @@ export default class LoggedIn extends React.Component { super(params); this.onUserChanged = this.onUserChanged.bind(this); + + this.state = { + user: null + }; + } + isValidState() { + return this.state.user != null; } onUserChanged() { // Grab the current user @@ -75,6 +83,8 @@ export default class LoggedIn extends React.Component { if (tutorialStep <= TutorialSteps.INTRO_SCREENS) { browserHistory.push(Utils.getTeamURLFromAddressBar() + '/tutorial'); } + + this.setState({user}); } componentWillMount() { // Emit view action @@ -186,6 +196,8 @@ export default class LoggedIn extends React.Component { Websockets.close(); UserStore.removeChangeListener(this.onUserChanged); + Utils.resetTheme(); + $('body').off('click.userpopover'); $('body').off('mouseenter mouseleave', '.post'); $('body').off('mouseenter mouseleave', '.post.post--comment.same--root'); @@ -195,6 +207,10 @@ export default class LoggedIn extends React.Component { $(window).off('keydown.preventBackspace'); } render() { + if (!this.isValidState()) { + return <LoadingScreen/>; + } + let content = []; if (this.props.children) { content = this.props.children; |