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

Merge pull request #6579 from nextcloud/settings-displayname-avatar 

Set the displayname for the avatar in the personal info
This commit is contained in:
Joas Schilling 2017-09-20 23:04:37 +02:00 committed by GitHub
parent 8358c63f53 72bf1df7f7
commit f0f396b527
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
settings/js/settings/personalInfo.js
View File

@ -41,8 +41,9 @@ jQuery.fn.keyUpDelayedOrEnter = function (callback, allowEmptyValue) {
}; };
function updateAvatar (hidedefault) { function updateAvatar (hidedefault) {
var $headerdiv = $('#header .avatardiv'); var $headerdiv = $('#header .avatardiv'),
var $displaydiv = $('#displayavatar .avatardiv'); $displaydiv = $('#displayavatar .avatardiv'),
user = OC.getCurrentUser();
//Bump avatar avatarversion //Bump avatar avatarversion
oc_userconfig.avatar.version = -(Math.floor(Math.random() * 1000)); oc_userconfig.avatar.version = -(Math.floor(Math.random() * 1000));
@ -52,11 +53,11 @@ function updateAvatar (hidedefault) {
$('#header .avatardiv').removeClass('avatardiv-shown'); $('#header .avatardiv').removeClass('avatardiv-shown');
} else { } else {
$headerdiv.css({'background-color': ''}); $headerdiv.css({'background-color': ''});
$headerdiv.avatar(OC.currentUser, 32, true); $headerdiv.avatar(user.uid, 32, true, false, undefined, user.displayName);
$('#header .avatardiv').addClass('avatardiv-shown'); $('#header .avatardiv').addClass('avatardiv-shown');
} }
$displaydiv.css({'background-color': ''}); $displaydiv.css({'background-color': ''});
$displaydiv.avatar(OC.currentUser, 145, true, null, function() { $displaydiv.avatar(user.uid, 145, true, null, function() {
$displaydiv.removeClass('loading'); $displaydiv.removeClass('loading');
$('#displayavatar img').show(); $('#displayavatar img').show();
if($('#displayavatar img').length === 0) { if($('#displayavatar img').length === 0) {
@ -64,7 +65,7 @@ function updateAvatar (hidedefault) {
} else { } else {
$('#removeavatar').removeClass('hidden').addClass('inlineblock'); $('#removeavatar').removeClass('hidden').addClass('inlineblock');
} }
}); }, user.displayName);
} }
function showAvatarCropper () { function showAvatarCropper () {
@ -388,13 +389,14 @@ $(document).ready(function () {
}); });
// Load the big avatar // Load the big avatar
$('#avatarform .avatardiv').avatar(OC.currentUser, 145, true, null, function() { var user = OC.getCurrentUser();
$('#avatarform .avatardiv').avatar(user.uid, 145, true, null, function() {
if($('#displayavatar img').length === 0) { if($('#displayavatar img').length === 0) {
$('#removeavatar').removeClass('inlineblock').addClass('hidden'); $('#removeavatar').removeClass('inlineblock').addClass('hidden');
} else { } else {
$('#removeavatar').removeClass('hidden').addClass('inlineblock'); $('#removeavatar').removeClass('hidden').addClass('inlineblock');
} }
}); }, user.displayName);
}); });
OC.Settings.updateAvatar = updateAvatar; OC.Settings.updateAvatar = updateAvatar;