sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

show spinner while loading/cropping avatar 

Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/1828/head
Robin Appelman 2016-10-20 16:36:03 +07:00
parent 154fbe06ce
commit ac167d4dc6
No known key found for this signature in database
GPG Key ID: 425003AC385454C5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
settings/js/personal.js
Unescape Escape View File

@ -112,7 +112,10 @@ function updateAvatar (hidedefault) {
$('#header .avatardiv').addClass('avatardiv-shown');
}
$displaydiv.css({'background-color': ''});
$displaydiv.avatar(OC.currentUser, 145, true);
$displaydiv.avatar(OC.currentUser, 145, true, null, function() {
$displaydiv.removeClass('loading');
$('#displayavatar img').show();
});
$.get(OC.generateUrl(
'/avatar/{user}/{size}',
{
@ -138,7 +141,6 @@ function showAvatarCropper () {
// Looks weird, but on('load', ...) doesn't work in IE8
$cropperImage.ready(function () {
$('#displayavatar').hide();
$cropperImage.Jcrop({
onChange: saveCoords,
@ -295,6 +297,8 @@ $(document).ready(function () {
avatarResponseHandler(response);
},
submit: function(e, data) {
$('#displayavatar img').hide();
$('#displayavatar .avatardiv').addClass('loading');
data.formData = _.extend(data.formData || {}, {
requesttoken: OC.requestToken
});
@ -321,6 +325,8 @@ $(document).ready(function () {
OC.dialogs.filepicker(
t('settings', "Select a profile picture"),
function (path) {
$('#displayavatar img').hide();
$('#displayavatar .avatardiv').addClass('loading');
$.ajax({
type: "POST",
url: OC.generateUrl('/avatar/'),
@ -358,6 +364,8 @@ $(document).ready(function () {
});
$('#abortcropperbutton').click(function () {
$('#displayavatar .avatardiv').removeClass('loading');
$('#displayavatar img').show();
cleanCropper();
});