summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-10-04 17:01:03 +0200
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2017-10-14 10:37:17 +0200
commit4ca88471b0ff08a92d2091b55bab5711ff00935c (patch)
tree8fc79718082a56f68f6500c09334b6760e4cf157 /settings/js
parent0ce3636fbaca4695f22f30fb6794e7dc36af5190 (diff)
downloadnextcloud-server-4ca88471b0ff08a92d2091b55bab5711ff00935c.tar.gz
nextcloud-server-4ca88471b0ff08a92d2091b55bab5711ff00935c.zip
Fix popover position and avatar loading
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/settings/personalInfo.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/settings/js/settings/personalInfo.js b/settings/js/settings/personalInfo.js
index 1c634bb2887..3a4542df748 100644
--- a/settings/js/settings/personalInfo.js
+++ b/settings/js/settings/personalInfo.js
@@ -128,6 +128,7 @@ function avatarResponseHandler (data) {
var $warning = $('#avatarform .warning');
$warning.hide();
if (data.status === "success") {
+ $('#displayavatar .avatardiv').removeClass('icon-loading');
updateAvatar();
} else if (data.data === "notsquare") {
showAvatarCropper();
@@ -302,7 +303,7 @@ $(document).ready(function () {
},
submit: function(e, data) {
$('#displayavatar img').hide();
- $('#displayavatar .avatardiv').addClass('loading');
+ $('#displayavatar .avatardiv').addClass('icon-loading');
data.formData = _.extend(data.formData || {}, {
requesttoken: OC.requestToken
});