Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-08 14:12:40 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Fix #2473

Browse Source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2016-12-06 18:01:24 +01:00
parent 0b0f27358f
commit 73c4112770
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
settings/js/personal.js
View File

@ -65,16 +65,9 @@ function updateAvatar (hidedefault) {
$displaydiv.avatar(OC.currentUser, 145, true, null, function() {
$displaydiv.removeClass('loading');
$('#displayavatar img').show();
});
$.get(OC.generateUrl(
'/avatar/{user}/{size}',
{
user: OC.currentUser,
size: 1
}
), function (result) {
if (typeof(result) === 'string') {
// Show the delete button when the avatar is custom
if($('#displayavatar img').length === 0) {
$('#removeavatar').removeClass('inlineblock').addClass('hidden');
} else {
$('#removeavatar').removeClass('hidden').addClass('inlineblock');
}
});
@ -314,7 +307,6 @@ $(document).ready(function () {
url: OC.generateUrl('/avatar/'),
success: function () {
updateAvatar(true);
$('#removeavatar').addClass('hidden').removeClass('inlineblock');
}
});
});
@ -341,24 +333,17 @@ $(document).ready(function () {
drawTitles: true,
});
// does the user have a custom avatar? if he does show #removeavatar
$.get(OC.generateUrl(
'/avatar/{user}/{size}',
{
user: OC.currentUser,
size: 1
}
), function (result) {
if (typeof(result) === 'string') {
// Show the delete button when the avatar is custom
$('#removeavatar').removeClass('hidden').addClass('inlineblock');
}
});
// Load the big avatar
if (oc_config.enable_avatars) {
$('#avatarform .avatardiv').avatar(OC.currentUser, 145);
$('#avatarform .avatardiv').avatar(OC.currentUser, 145, true, null, function() {
if($('#displayavatar img').length === 0) {
$('#removeavatar').removeClass('inlineblock').addClass('hidden');
} else {
$('#removeavatar').removeClass('hidden').addClass('inlineblock');
}
});
}
// Show token views
var collection = new OC.Settings.AuthTokenCollection();