mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove show() function since we always show the avatar container 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-01-05 11:47:03 +01:00
parent ecf8850464
commit 04a18098e4
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/js/jquery.avatar.js
View File

@ -110,9 +110,8 @@
// If the new image loads successfully set it. // If the new image loads successfully set it.
img.onload = function() { img.onload = function() {
$div.text('');
$div.append(img);
$div.clearimageplaceholder(); $div.clearimageplaceholder();
$div.append(img);
if(typeof callback === 'function') { if(typeof callback === 'function') {
callback(); callback();
@ -127,7 +126,6 @@
$div.imageplaceholder(user, displayname); $div.imageplaceholder(user, displayname);
} else { } else {
setAvatarForUnknownUser($div); setAvatarForUnknownUser($div);
$div.removeClass('icon-loading');
} }
if(typeof callback === 'function') { if(typeof callback === 'function') {
@ -136,7 +134,6 @@
}; };
$div.addClass('icon-loading'); $div.addClass('icon-loading');
$div.show();
img.width = size; img.width = size;
img.height = size; img.height = size;
img.src = url; img.src = url;

1
core/js/placeholder.js
View File

@ -156,6 +156,7 @@
this.css('text-align', ''); this.css('text-align', '');
this.css('line-height', ''); this.css('line-height', '');
this.css('font-size', ''); this.css('font-size', '');
this.html('');
this.removeClass('icon-loading'); this.removeClass('icon-loading');
}; };
}(jQuery)); }(jQuery));