From 1ad8c6e95522cc74935459648ba9e23195e18c00 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 27 Apr 2015 14:52:54 -0400
Subject: [PATCH] improve user image resolution

---
 dashboard-ui/scripts/librarymenu.js           |  8 ++++----
 dashboard-ui/scripts/site.js                  |  2 +-
 .../thirdparty/apiclient/apiclient.js         | 20 +++++++++++++++++++
 .../thirdparty/apiclient/connectionmanager.js |  2 +-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index a05072e5f6..4370646a2d 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -50,7 +50,7 @@
             var url = user.imageUrl;
 
             if (user.supportsImageParams) {
-                url += "&height=" + userButtonHeight;
+                url += "&height=" + (userButtonHeight * Math.max(devicePixelRatio || 1, 2));
             }
 
             html += '<img src="' + url + '" style="border-radius: 1000px; height:' + userButtonHeight + 'px;" />';
@@ -253,7 +253,7 @@
 
             html += '<div class="sidebarLinks librarySidebarLinks">';
 
-            html += '<a style="margin-top:0;padding-left:1em;display:block;color:#fff;text-decoration:none;font-size:16px;font-weight:400!important;background: #000;" href="mypreferencesdisplay.html?userId=' + Dashboard.getCurrentUserId() + '">';
+            html += '<a style="margin-top:0;padding-left:.6em;display:block;color:#fff;text-decoration:none;font-size:16px;font-weight:400!important;background: #000;" href="mypreferencesdisplay.html?userId=' + Dashboard.getCurrentUserId() + '">';
 
             var imgWidth = 48;
 
@@ -261,10 +261,10 @@
                 var url = user.imageUrl;
 
                 if (user.supportsImageParams) {
-                    url += "&width=" + imgWidth;
+                    url += "&width=" + (imgWidth * Math.max(devicePixelRatio || 1, 2));
                 }
 
-                html += '<img style="max-width:' + imgWidth + 'px;vertical-align:middle;margin-right:.75em;border-radius: 50px;" src="' + url + '" />';
+                html += '<img style="max-width:' + imgWidth + 'px;vertical-align:middle;margin-right:.8em;border-radius: 50px;" src="' + url + '" />';
             }
             html += user.name;
             html += '</a>';
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index d00fb44626..e00f6d79e2 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -583,7 +583,7 @@ var Dashboard = {
                 var url = user.imageUrl;
 
                 if (user.supportsImageParams) {
-                    url += "&width=" + imgWidth;
+                    url += "&width=" + (imgWidth * Math.max(devicePixelRatio || 1, 2));
                 }
 
                 html += '<img style="max-width:' + imgWidth + 'px;vertical-align:middle;margin-right:.5em;border-radius: 50px;" src="' + url + '" />';
diff --git a/dashboard-ui/thirdparty/apiclient/apiclient.js b/dashboard-ui/thirdparty/apiclient/apiclient.js
index 831eca956e..4f1e4eab9f 100644
--- a/dashboard-ui/thirdparty/apiclient/apiclient.js
+++ b/dashboard-ui/thirdparty/apiclient/apiclient.js
@@ -54,6 +54,25 @@
             return serverInfo;
         };
 
+        var currentUser;
+        /**
+         * Gets or sets the current user id.
+         */
+        self.getCurrentUser = function () {
+
+            if (currentUser != null) {
+
+                var deferred = DeferredBuilder.Deferred();
+                deferred.resolveWith(null, [currentUser]);
+                return deferred.promise();
+            }
+
+            return self.getUser(self.getCurrentUserId()).done(function (user) {
+
+                currentUser = user;
+            });
+        };
+
         /**
          * Gets or sets the current user id.
          */
@@ -69,6 +88,7 @@
         self.setCurrentUserId = function (userId, token) {
 
             currentUserId = userId;
+            currentUser = null;
             accessToken = token;
         };
 
diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
index c56402612f..2d796f5eb1 100644
--- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js
+++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
@@ -433,7 +433,7 @@
 
                 var apiClient = self.currentApiClient();
                 if (apiClient && apiClient.getCurrentUserId()) {
-                    apiClient.getUser(apiClient.getCurrentUserId()).done(function (u) {
+                    apiClient.getCurrentUser().done(function (u) {
                         localUser = u;
                     }).always(onLocalUserDone);
                 } else {