diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-17 16:07:50 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-17 16:07:50 +0100 |
| commit | 3bcaaa6c3a2bafa9b4685bbbac9e4a1d158bd64e (patch) | |
| tree | 7d95d99a255b4646a3d40ae7d2846d1a9084ef58 | |
| parent | a9ad5c7b6bbbdce1994fd60884c2be5468971ccf (diff) | |
| parent | a81836a42fa1b35b07cb7aad2a86d5057a61b27b (diff) | |
| download | nextcloud-server-3bcaaa6c3a2bafa9b4685bbbac9e4a1d158bd64e.tar.gz nextcloud-server-3bcaaa6c3a2bafa9b4685bbbac9e4a1d158bd64e.zip | |
Merge pull request #21259 from owncloud/load_big_avatar_only_personal
Only load the big (128x128) avatar on the perosnal page
| -rw-r--r-- | core/js/avatar.js | 3 | ||||
| -rw-r--r-- | 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 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) { |