diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2017-09-26 22:50:16 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-09-26 22:50:16 +0200 |
| commit | b0c9380114f01917e68804da7608dfc9d0eab972 (patch) | |
| tree | 7c1d2a7a35d6d1719cf4211535c10687d916e5d8 | |
| parent | 271959b1d97b30388ac55efa94b6d5d1e28fa22d (diff) | |
| download | nextcloud-server-b0c9380114f01917e68804da7608dfc9d0eab972.tar.gz nextcloud-server-b0c9380114f01917e68804da7608dfc9d0eab972.zip | |
Don't show placeholder when we have loaded the avatar image
Fixes #6618
Else it shows up as background to transparent avatars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| -rw-r--r-- | core/js/jquery.avatar.js | 1 | ||||
| -rw-r--r-- | core/js/placeholder.js | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index fae100fda21..a320496e250 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -148,6 +148,7 @@ $div.show(); $div.text(''); $div.append(img); + $div.clearimageplaceholder(); }; img.width = size; diff --git a/core/js/placeholder.js b/core/js/placeholder.js index b8075b5397f..f173e738676 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -148,4 +148,13 @@ this.html(text[0].toUpperCase()); } }; + + $.fn.clearimageplaceholder = function() { + this.css('background-color', ''); + this.css('color', ''); + this.css('font-weight', ''); + this.css('text-align', ''); + this.css('line-height', ''); + this.css('font-size', ''); + }; }(jQuery)); |