diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-01-05 11:47:03 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-01-08 10:36:06 +0100 |
| commit | 04a18098e458bccfe632e4e30d879d87d2b60d47 (patch) | |
| tree | 919c2214c227479667d515bd8b4202cbaf3be225 /core/js | |
| parent | ecf885046459253fbe4599600db241b9e36fa61a (diff) | |
| download | nextcloud-server-04a18098e458bccfe632e4e30d879d87d2b60d47.tar.gz nextcloud-server-04a18098e458bccfe632e4e30d879d87d2b60d47.zip | |
Remove show() function since we always show the avatar container
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/jquery.avatar.js | 5 | ||||
| -rw-r--r-- | core/js/placeholder.js | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index 958f0f9edd7..6da86341c1e 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -110,9 +110,8 @@ // If the new image loads successfully set it. img.onload = function() { - $div.text(''); - $div.append(img); $div.clearimageplaceholder(); + $div.append(img); if(typeof callback === 'function') { callback(); @@ -127,7 +126,6 @@ $div.imageplaceholder(user, displayname); } else { setAvatarForUnknownUser($div); - $div.removeClass('icon-loading'); } if(typeof callback === 'function') { @@ -136,7 +134,6 @@ }; $div.addClass('icon-loading'); - $div.show(); img.width = size; img.height = size; img.src = url; diff --git a/core/js/placeholder.js b/core/js/placeholder.js index 5cf7b9095ad..29f91b6698d 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -156,6 +156,7 @@ this.css('text-align', ''); this.css('line-height', ''); this.css('font-size', ''); + this.html(''); this.removeClass('icon-loading'); }; }(jQuery)); |