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

Merge pull request #21912 from owncloud/issue-21908-trashbin-flickering 

Hide the delete button, until we know its a custom avatar
This commit is contained in:
Thomas Müller 2016-01-26 16:16:21 +01:00
parent 6deb553dc2 751e99512a
commit f383332d83
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
settings/js/personal.js
View File

@ -100,7 +100,7 @@ function updateAvatar (hidedefault) {
$displaydiv.css({'background-color': ''});
$displaydiv.avatar(OC.currentUser, 145, true);
$('#removeavatar').show();
$('#removeavatar').removeClass('hidden').addClass('inlineblock');
}
function showAvatarCropper () {
@ -303,7 +303,7 @@ $(document).ready(function () {
url: OC.generateUrl('/avatar/'),
success: function () {
updateAvatar(true);
$('#removeavatar').hide();
$('#removeavatar').addClass('hidden').removeClass('inlineblock');
}
});
});
@ -327,15 +327,14 @@ $(document).ready(function () {
]
});
// 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(
// does the user have a custom avatar? if he does show #removeavatar
$.get(OC.generateUrl(
'/avatar/{user}/{size}',
{user: OC.currentUser, size: 1}
);
$.get(url, function (result) {
if (typeof(result) === 'object') {
$('#removeavatar').hide();
), function (result) {
if (typeof(result) === 'string') {
// Show the delete button when the avatar is custom
$('#removeavatar').removeClass('hidden').addClass('inlineblock');
}
});

2
settings/templates/personal.php
View File

@ -41,7 +41,7 @@
<?php if ($_['avatarChangeSupported']): ?>
<label for="uploadavatar" class="inlineblock button icon-upload svg" id="uploadavatarbutton" title="<?php p($l->t('Upload new')); ?>"></label>
<div class="inlineblock button icon-folder svg" id="selectavatar" title="<?php p($l->t('Select from Files')); ?>"></div>
<div class="inlineblock button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
<?php else: ?>