From d9e936e9f805cd9c474eb0acdf601a129b28201a Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Wed, 28 Feb 2018 16:08:22 +0100 Subject: Prevent double selection of avatar and loading fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- settings/js/settings/personalInfo.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'settings/js') 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(); }); -- cgit v1.2.3