wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10833 from nextcloud/fix_8623

Browse source 
Re-enable upload button after updating Avatar fixes #8623
This commit is contained in:
Morris Jobke 2018-09-27 17:27:12 +02:00 committed by GitHub
commit c367f95afa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
settings/js/settings/personalInfo.js
View file

@ -67,6 +67,7 @@ function updateAvatar (hidedefault) {
$('#removeavatar').removeClass('hidden').addClass('inlineblock'); $('#removeavatar').removeClass('hidden').addClass('inlineblock');
} }
}, user.displayName); }, user.displayName);
$('#uploadavatar').prop('disabled', false);
} }
function showAvatarCropper () { function showAvatarCropper () {
@ -308,7 +309,7 @@ $(document).ready(function () {
function (path) { function (path) {
$('#displayavatar img').hide(); $('#displayavatar img').hide();
$('#displayavatar .avatardiv').addClass('icon-loading'); $('#displayavatar .avatardiv').addClass('icon-loading');
$('#uploadavatar').prop('disabled', true) $('#uploadavatar').prop('disabled', true);
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: OC.generateUrl('/avatar/'), url: OC.generateUrl('/avatar/'),
@ -348,7 +349,7 @@ $(document).ready(function () {
$('#abortcropperbutton').click(function () { $('#abortcropperbutton').click(function () {
$('#displayavatar .avatardiv').removeClass('icon-loading'); $('#displayavatar .avatardiv').removeClass('icon-loading');
$('#displayavatar img').show(); $('#displayavatar img').show();
$('#uploadavatar').prop('disabled', false) $('#uploadavatar').prop('disabled', false);
cleanCropper(); cleanCropper();
}); });