From 265af89fe6780307e6f4585768d5687f8fbd6c44 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 8 Feb 2014 15:22:40 -0500 Subject: [PATCH] minor cleanup --- dashboard-ui/scripts/site.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index f6d22bb3bc..3ff7fbc749 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -92,21 +92,16 @@ var Dashboard = { } var autoLoginUserId = getParameterByName('u'); + var storedUserId = localStorage.getItem("userId"); var userId; - if (autoLoginUserId) { - userId = localStorage.getItem("userId"); - - if (userId != autoLoginUserId) { - - userId = autoLoginUserId; - Dashboard.setCurrentUser(userId); - } + if (autoLoginUserId && autoLoginUserId != storedUserId) { + + localStorage.setItem("userId", autoLoginUserId); + ApiClient.currentUserId(autoLoginUserId); } - userId = userId || localStorage.getItem("userId"); - - return userId; + return autoLoginUserId || storedUserId; }, setCurrentUser: function (userId) {