From abb6b6519fcf719817ee0cf06e241a236aeb5ed0 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 12 Nov 2013 20:52:55 +1100 Subject: [PATCH] Fixes gravatar JS issue if user times out --- .../src/views/common/main.controller.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js index 9141369783..6234d6df70 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/main.controller.js @@ -99,16 +99,18 @@ function MainController($scope, $location, $routeParams, $rootScope, $timeout, $ } if($scope.user.emailHash){ - $timeout(function(){ + $timeout(function () { //yes this is wrong.. - $("#avatar-img").fadeTo(1000, 0, function(){ - - $timeout(function(){ - $scope.avatar = "http://www.gravatar.com/avatar/" + $scope.user.emailHash +".jpg?s=64&d=mm"; - }); - - $("#avatar-img").fadeTo(1000, 1); + $("#avatar-img").fadeTo(1000, 0, function () { + $timeout(function () { + //this can be null if they time out + if ($scope.user && $scope.user.emailHash) { + $scope.avatar = "http://www.gravatar.com/avatar/" + $scope.user.emailHash + ".jpg?s=64&d=mm"; + } + }); + $("#avatar-img").fadeTo(1000, 1); }); + }, 3000); }