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

Merge pull request #2534 from nextcloud/fix-avatar-upload-buttons 

Fix avatar delete button
This commit is contained in:
Roeland Jago Douma 2016-12-08 13:44:26 +01:00 committed by GitHub
parent 74d1b0bada 73c4112770
commit ce707912b4
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
settings/js/personal.js
View File

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