From b704e9489b21b3bec17f5c8b573a1724781ee6f7 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Fri, 14 Aug 2015 08:43:49 -0400
Subject: added google sign-in functionality to the client, with minor model
 modifications

---
 web/react/utils/async_client.jsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'web/react/utils/async_client.jsx')

diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 0b87bbd7b..09710ddf0 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 getMe() {
-    if (isCallInProgress('getMe')) {
+function getMeSynchronous() {
+    if (isCallInProgress('getMeSynchronous')) {
         return;
     }
 
-    callTracker.getMe = utils.getTimestamp();
-    client.getMe(
+    callTracker.getMeSynchronous = utils.getTimestamp();
+    client.getMeSynchronous(
         function(data, textStatus, xhr) {
-            callTracker.getMe = 0;
+            callTracker.getMeSynchronous = 0;
 
             if (xhr.status === 304 || !data) return;
 
@@ -409,11 +409,11 @@ function getMe() {
         },
         function(err) {
             callTracker.getMe = 0;
-            dispatchError(err, 'getMe');
+            dispatchError(err, 'getMeSynchronous');
         }
     );
 }
-module.exports.getMe = getMe;
+module.exports.getMeSynchronous = getMeSynchronous;
 
 module.exports.getStatuses = function() {
     if (isCallInProgress('getStatuses')) return;
-- 
cgit v1.2.3-1-g7c22


From a7f09be9783f3354ab38d4fb4fb82085241d018f Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Fri, 14 Aug 2015 12:39:38 -0400
Subject: merge async_client getMe changes

---
 web/react/utils/async_client.jsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'web/react/utils/async_client.jsx')

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;
-- 
cgit v1.2.3-1-g7c22

