diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-07-18 11:10:03 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-18 11:10:03 -0400 |
commit | c0ab2636d699c8544ce03a58f61b95cfd66ff7ce (patch) | |
tree | c7d07934e0ff1a75aafb097a184ae150888199c0 /webapp/components/logged_in.jsx | |
parent | 180adc79af3d14de6ce62f6e687a6735db3fe82f (diff) | |
download | chat-c0ab2636d699c8544ce03a58f61b95cfd66ff7ce.tar.gz chat-c0ab2636d699c8544ce03a58f61b95cfd66ff7ce.tar.bz2 chat-c0ab2636d699c8544ce03a58f61b95cfd66ff7ce.zip |
PLT-2241 Refactored statuses into a more real-time system (#3573)
* Refactored statuses into a more real-time system
* Updated package.json with correct commit and fixed minor bug
* Minor updates to statuses based on feedback
* When setting status online, update only LastActivityAt if status already exists
Diffstat (limited to 'webapp/components/logged_in.jsx')
-rw-r--r-- | webapp/components/logged_in.jsx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx index 2ac858dfb..14b7e138b 100644 --- a/webapp/components/logged_in.jsx +++ b/webapp/components/logged_in.jsx @@ -8,13 +8,12 @@ import UserStore from 'stores/user_store.jsx'; import BrowserStore from 'stores/browser_store.jsx'; import PreferenceStore from 'stores/preference_store.jsx'; import * as Utils from 'utils/utils.jsx'; -import * as Websockets from 'actions/websocket_actions.jsx'; import * as GlobalActions from 'actions/global_actions.jsx'; +import * as WebSocketActions from 'actions/websocket_actions.jsx'; import Constants from 'utils/constants.jsx'; import {browserHistory} from 'react-router/es6'; -const CLIENT_STATUS_INTERVAL = 30000; const BACKSPACE_CHAR = 8; import React from 'react'; @@ -26,8 +25,8 @@ export default class LoggedIn extends React.Component { this.onUserChanged = this.onUserChanged.bind(this); this.setupUser = this.setupUser.bind(this); - // Initalize websockets - Websockets.initialize(); + // Initalize websocket + WebSocketActions.initialize(); // Force logout of all tabs if one tab is logged out $(window).bind('storage', (e) => { @@ -109,10 +108,6 @@ export default class LoggedIn extends React.Component { // Listen for user UserStore.addChangeListener(this.onUserChanged); - // Get all statuses regularally. (Soon to be switched to websocket) - AsyncClient.getStatuses(); - this.intervalId = setInterval(() => AsyncClient.getStatuses(), CLIENT_STATUS_INTERVAL); - // ??? $('body').on('mouseenter mouseleave', '.post', function mouseOver(ev) { if (ev.type === 'mouseenter') { @@ -144,7 +139,7 @@ export default class LoggedIn extends React.Component { } }); - // Pervent backspace from navigating back a page + // Prevent backspace from navigating back a page $(window).on('keydown.preventBackspace', (e) => { if (e.which === BACKSPACE_CHAR && !$(e.target).is('input, textarea')) { e.preventDefault(); @@ -159,9 +154,8 @@ export default class LoggedIn extends React.Component { componentWillUnmount() { $('#root').attr('class', ''); - clearInterval(this.intervalId); - Websockets.close(); + WebSocketActions.close(); UserStore.removeChangeListener(this.onUserChanged); $('body').off('click.userpopover'); |