summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@owncloud.com>2015-12-17 13:46:25 +0100
committerRoeland Jago Douma <rullzer@owncloud.com>2015-12-17 13:55:22 +0100
commita81836a42fa1b35b07cb7aad2a86d5057a61b27b (patch)
tree80c5e18388f832888cec371f512cbf7529f84d52
parent21bd19b6ae788b5e91ae654b3f1fc6a04612fd01 (diff)
downloadnextcloud-server-a81836a42fa1b35b07cb7aad2a86d5057a61b27b.tar.gz
nextcloud-server-a81836a42fa1b35b07cb7aad2a86d5057a61b27b.zip
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.
-rw-r--r--core/js/avatar.js3
-rw-r--r--settings/js/personal.js5
2 files changed, 6 insertions, 2 deletions
diff --git a/core/js/avatar.js b/core/js/avatar.js
index 8ff136d67ca..10214c35fbe 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 8362adac2a6..b90194b90ec 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) {