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

Merge pull request #8585 from nextcloud/avatar-loading-disable-fix

Browse source 
Prevent double selection of avatar and loading fix
This commit is contained in:
Roeland Jago Douma 2018-03-01 20:12:25 +01:00 committed by GitHub
commit effc00c940
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
settings/js/settings/personalInfo.js
View file

@ -311,11 +311,14 @@ $(document).ready(function () {
submit: function(e, data) {
$('#displayavatar img').hide();
$('#displayavatar .avatardiv').addClass('icon-loading');
$('#uploadavatar').prop('disabled', true)
data.formData = _.extend(data.formData || {}, {
requesttoken: OC.requestToken
});
},
fail: function (e, data){
fail: function (e, data) {
$('#displayavatar .avatardiv').removeClass('icon-loading');
$('#uploadavatar').prop('disabled', false)
var msg = data.jqXHR.statusText + ' (' + data.jqXHR.status + ')';
if (!_.isUndefined(data.jqXHR.responseJSON) &&
!_.isUndefined(data.jqXHR.responseJSON.data) &&
@ -338,7 +341,8 @@ $(document).ready(function () {
t('settings', "Select a profile picture"),
function (path) {
$('#displayavatar img').hide();
$('#displayavatar .avatardiv').addClass('loading');
$('#displayavatar .avatardiv').addClass('icon-loading');
$('#uploadavatar').prop('disabled', true)
$.ajax({
type: "POST",
url: OC.generateUrl('/avatar/'),
@ -376,8 +380,9 @@ $(document).ready(function () {
});
$('#abortcropperbutton').click(function () {
$('#displayavatar .avatardiv').removeClass('loading');
$('#displayavatar .avatardiv').removeClass('icon-loading');
$('#displayavatar img').show();
$('#uploadavatar').prop('disabled', false)
cleanCropper();
});