diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-11-03 15:11:16 -0500 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-11-03 15:11:16 -0500 |
| commit | a26145ef91197ba374d525c947984ae672cbd94d (patch) | |
| tree | 82fcbf8af647be2e31afadb9c595a5a5943959ab /web/react | |
| parent | fb5b57836ece6da2d0136802ca0d08346638b9e2 (diff) | |
| download | chat-a26145ef91197ba374d525c947984ae672cbd94d.tar.gz chat-a26145ef91197ba374d525c947984ae672cbd94d.tar.bz2 chat-a26145ef91197ba374d525c947984ae672cbd94d.zip | |
Minor changes to statuses client code
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/channel_loader.jsx | 9 | ||||
| -rw-r--r-- | web/react/components/sidebar.jsx | 3 | ||||
| -rw-r--r-- | web/react/utils/async_client.jsx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index edc13f7ab..4fc115a92 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -30,19 +30,14 @@ export default class ChannelLoader extends React.Component { AsyncClient.getChannels(true, true); AsyncClient.getChannelExtraInfo(true); AsyncClient.findTeams(); - AsyncClient.getStatuses(); AsyncClient.getMyTeam(); + setTimeout(() => AsyncClient.getStatuses(), 3000); // temporary until statuses are reworked a bit /* Perform pending post clean-up */ PostStore.clearPendingPosts(); /* Set up interval functions */ - this.intervalId = setInterval( - () => { - AsyncClient.getStatuses(); - }, - 30000 - ); + this.intervalId = setInterval(() => AsyncClient.getStatuses(), 30000); /* Device tracking setup */ var iOS = (/(iPad|iPhone|iPod)/g).test(navigator.userAgent); diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index e47ba6edf..aab9919a4 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -113,6 +113,9 @@ export default class Sidebar extends React.Component { for (var i = 0; i < directChannels.length; i++) { const dm = directChannels[i]; const teammate = Utils.getDirectTeammate(dm.id); + if (!teammate) { + continue; + } const member = members[dm.id]; const msgCount = dm.total_msg_count - member.msg_count; diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx index 0ecd26186..205c7461c 100644 --- a/web/react/utils/async_client.jsx +++ b/web/react/utils/async_client.jsx @@ -593,7 +593,9 @@ export function getStatuses() { const teammateIds = []; for (var i = 0; i < directChannels.length; i++) { const teammate = utils.getDirectTeammate(directChannels[i].id); - teammateIds.push(teammate.id); + if (teammate) { + teammateIds.push(teammate.id); + } } if (isCallInProgress('getStatuses') || teammateIds.length === 0) { |