mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7340 from owncloud/hide_remove_image_avatar 

Hide remove image, if there's no custom avatar
This commit is contained in:
Morris Jobke 2014-03-13 13:20:00 +01:00
parent 9fa9c791eb 8fafee31ef
commit 3c03ff5bb5
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
settings/js/personal.js
View File

@ -60,6 +60,8 @@ function updateAvatar (hidedefault) {
}
$displaydiv.css({'background-color': ''});
$displaydiv.avatar(OC.currentUser, 128, true);
$('#removeavatar').show();
}
function showAvatarCropper() {
@ -256,6 +258,7 @@ $(document).ready(function(){
url: OC.generateUrl('/avatar/'),
success: function(msg) {
updateAvatar(true);
$('#removeavatar').hide();
}
});
});
@ -278,6 +281,18 @@ $(document).ready(function(){
t('core', 'Strong password')
]
});
// does the user have a custom avatar? if he does hide #removeavatar
// needs to be this complicated because we can't check yet if an avatar has been loaded, because it's async
var url = OC.generateUrl(
'/avatar/{user}/{size}',
{user: OC.currentUser, size: 1}
) + '?requesttoken=' + oc_requesttoken;
$.get(url, function(result) {
if (typeof(result) === 'object') {
$('#removeavatar').hide();
}
});
} );
OC.Encryption = {