Repository: archiva Updated Branches: refs/heads/master 55795f1d1 -> dc52ac5c7
[MRM-1853] On first start up, you get a perpetual loading indicator. Submitted by Robert David Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/dc52ac5c Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/dc52ac5c Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/dc52ac5c Branch: refs/heads/master Commit: dc52ac5c79b6eda4687518553e20c63fd9ab9af6 Parents: 55795f1 Author: Olivier Lamy <[email protected]> Authored: Thu Jul 24 12:08:19 2014 +1000 Committer: Olivier Lamy <[email protected]> Committed: Thu Jul 24 12:08:19 2014 +1000 ---------------------------------------------------------------------- .../archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/dc52ac5c/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js index 87d8272..1de6e59 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js @@ -66,6 +66,9 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa getUserFromLoginCookie=function(){ var cookieContent=$.cookie('archiva_login'); $.log("archiva_getUserFromLoginCookie cookie content:"+cookieContent); + if (!cookieContent) { + return null; + } var user = $.parseJSON(cookieContent); if(!user){ return null;
