diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-09-27 10:11:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 10:11:19 +0200 |
| commit | 1fc8ac6db26a8fcb4f7b5340f096ad4817220ae1 (patch) | |
| tree | 7e17d72ead446d4b7573d9dafdffa1aab3a8270a | |
| parent | de2dc3c9196c5d8a869f5bc16e4e24262ac234c8 (diff) | |
| parent | b0c9380114f01917e68804da7608dfc9d0eab972 (diff) | |
| download | nextcloud-server-1fc8ac6db26a8fcb4f7b5340f096ad4817220ae1.tar.gz nextcloud-server-1fc8ac6db26a8fcb4f7b5340f096ad4817220ae1.zip | |
Merge pull request #6658 from nextcloud/fix_6618
Don't show placeholder when we have loaded the avatar image
| -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)); |