From 3815ab806585afa205c074c0b40ddc31e4314190 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Thu, 6 Aug 2015 11:05:13 -0700
Subject: Added keys to array-based elements and made getMe asynchronous

---
 web/react/utils/async_client.jsx |  2 +-
 web/react/utils/client.jsx       | 14 +++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'web/react/utils')

diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index dc4fc1096..f35b0f6cc 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -322,7 +322,7 @@ module.exports.getMe = function() {
     if (isCallInProgress("getMe")) return;
 
     callTracker["getMe"] = utils.getTimestamp();
-    client.getMeSynchronous(
+    client.getMe(
         function(data, textStatus, xhr) {
             callTracker["getMe"] = 0;
 
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index b8eda0075..3375da7cf 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -279,32 +279,24 @@ module.exports.getAudits = function(userId, success, error) {
     });
 };
 
-module.exports.getMeSynchronous = function(success, error) {
-
-    var current_user = null;
+module.exports.getMe = function(success, error) {
 
     $.ajax({
-        async: false,
         url: "/api/v1/users/me",
         dataType: 'json',
         contentType: 'application/json',
         type: 'GET',
-        success: function(data, textStatus, xhr) {
-            current_user = data;
-            if (success) success(data, textStatus, xhr);
-        },
+        success: success,
         error: function(xhr, status, err) {
             var ieChecker = window.navigator.userAgent; // This and the condition below is used to check specifically for browsers IE10 & 11 to suppress a 200 'OK' error from appearing on login
             if (xhr.status != 200 || !(ieChecker.indexOf("Trident/7.0") > 0 || ieChecker.indexOf("Trident/6.0") > 0)) {
                 if (error) {
-                    e = handleError("getMeSynchronous", xhr, status, err);
+                    e = handleError("getMe", xhr, status, err);
                     error(e);
                 };
             };
         }
     });
-
-    return current_user;
 };
 
 module.exports.inviteMembers = function(data, success, error) {
-- 
cgit v1.2.3-1-g7c22