diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-11-15 08:06:58 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-11-15 08:06:58 -0500 |
| commit | e4f46124b0aa0d661bf59f229c0ebc3c7dc65d1d (patch) | |
| tree | 1cc25ee31b1de89653d72df0412967959963861f /webapp/components/logged_in.jsx | |
| parent | 7df8eaf29aa59467236c1b434bc09ccc33cd011f (diff) | |
| parent | 3f19ccf1b1a6efdcc990cf8a0270ec4ffc0c6e22 (diff) | |
| download | chat-e4f46124b0aa0d661bf59f229c0ebc3c7dc65d1d.tar.gz chat-e4f46124b0aa0d661bf59f229c0ebc3c7dc65d1d.tar.bz2 chat-e4f46124b0aa0d661bf59f229c0ebc3c7dc65d1d.zip | |
Merge branch 'release-3.5'
Diffstat (limited to 'webapp/components/logged_in.jsx')
| -rw-r--r-- | webapp/components/logged_in.jsx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx index 4e7df0392..ec4ca2a6a 100644 --- a/webapp/components/logged_in.jsx +++ b/webapp/components/logged_in.jsx @@ -14,8 +14,6 @@ import {loadEmoji} from 'actions/emoji_actions.jsx'; import * as Utils from 'utils/utils.jsx'; import Constants from 'utils/constants.jsx'; -import {browserHistory} from 'react-router/es6'; - const BACKSPACE_CHAR = 8; import $ from 'jquery'; @@ -41,7 +39,7 @@ export default class LoggedIn extends React.Component { } console.log('detected logout from a different tab'); //eslint-disable-line no-console - browserHistory.push('/'); + GlobalActions.emitUserLoggedOutEvent('/', false); } if (e.originalEvent.key === '__login__' && e.originalEvent.storageArea === localStorage && e.originalEvent.newValue) { |