diff options
author | JoramWilander <jwawilander@gmail.com> | 2015-08-14 12:39:38 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-08-14 12:39:38 -0400 |
commit | a7f09be9783f3354ab38d4fb4fb82085241d018f (patch) | |
tree | 8aa1a590b10d1944d812c32e5ae1a283189067a4 | |
parent | 3faa09c641cc6cb7f2a5e88d080b6a90339972d9 (diff) | |
download | chat-a7f09be9783f3354ab38d4fb4fb82085241d018f.tar.gz chat-a7f09be9783f3354ab38d4fb4fb82085241d018f.tar.bz2 chat-a7f09be9783f3354ab38d4fb4fb82085241d018f.zip |
merge async_client getMe changes
-rw-r--r-- | web/react/utils/async_client.jsx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx index 09710ddf0..8b6d821d6 100644 --- a/web/react/utils/async_client.jsx +++ b/web/react/utils/async_client.jsx @@ -390,15 +390,15 @@ module.exports.getPosts = function(force, id, maxPosts) { } } -function getMeSynchronous() { - if (isCallInProgress('getMeSynchronous')) { +function getMe() { + if (isCallInProgress('getMe')) { return; } - callTracker.getMeSynchronous = utils.getTimestamp(); + callTracker.getMe = utils.getTimestamp(); client.getMeSynchronous( function(data, textStatus, xhr) { - callTracker.getMeSynchronous = 0; + callTracker.getMe = 0; if (xhr.status === 304 || !data) return; @@ -409,11 +409,11 @@ function getMeSynchronous() { }, function(err) { callTracker.getMe = 0; - dispatchError(err, 'getMeSynchronous'); + dispatchError(err, 'getMe'); } ); } -module.exports.getMeSynchronous = getMeSynchronous; +module.exports.getMe = getMe; module.exports.getStatuses = function() { if (isCallInProgress('getStatuses')) return; |