diff options
author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-02-28 16:08:22 +0100 |
---|---|---|
committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-02-28 16:08:22 +0100 |
commit | d9e936e9f805cd9c474eb0acdf601a129b28201a (patch) | |
tree | a813fcae2375beef26b0cedbeec7bdeed38d88bb /settings | |
parent | 0cfdf4748f248e1b55fc459a05e7782a1e585716 (diff) | |
download | nextcloud-server-d9e936e9f805cd9c474eb0acdf601a129b28201a.tar.gz nextcloud-server-d9e936e9f805cd9c474eb0acdf601a129b28201a.zip |
Prevent double selection of avatar and loading fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings')
-rw-r--r-- | settings/js/settings/personalInfo.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/settings/js/settings/personalInfo.js b/settings/js/settings/personalInfo.js index 99254c42090..565ae4a2f5b 100644 --- a/settings/js/settings/personalInfo.js +++ b/settings/js/settings/personalInfo.js @@ -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(); }); |