From a81836a42fa1b35b07cb7aad2a86d5057a61b27b Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Thu, 17 Dec 2015 13:46:25 +0100 Subject: [PATCH] Only load the big (128x128) avatar on the perosnal page Before the code was executed on every page if a user was logged in. Now only on the personal page. Thus saving a request on all other pages. --- core/js/avatar.js | 3 +-- settings/js/personal.js | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/js/avatar.js b/core/js/avatar.js index 8ff136d67c..10214c35fb 100644 --- a/core/js/avatar.js +++ b/core/js/avatar.js @@ -1,7 +1,6 @@ $(document).ready(function(){ if (OC.currentUser) { - // Personal settings - $('#avatar .avatardiv').avatar(OC.currentUser, 128); + } // User settings $.each($('td.avatar .avatardiv'), function(i, element) { diff --git a/settings/js/personal.js b/settings/js/personal.js index 8362adac2a..b90194b90e 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -405,6 +405,11 @@ $(document).ready(function () { if ($('#sslCertificate > tbody > tr').length === 0) { $('#sslCertificate').hide(); } + + // Load the big avatar + if (oc_config.enable_avatars) { + $('#avatar .avatardiv').avatar(OC.currentUser, 128); + } }); if (!OC.Encryption) {