diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2017-12-14 08:29:22 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2017-12-19 18:49:26 +0100 |
| commit | a118817a69e123b74a48b0c85df15da3487ff070 (patch) | |
| tree | ce90510dcd574293c6a64adba45af930144d5fcf /core/js | |
| parent | 0f235aec1f85078b13ee7a1b1b8bbccc942a68f3 (diff) | |
| download | nextcloud-server-a118817a69e123b74a48b0c85df15da3487ff070.tar.gz nextcloud-server-a118817a69e123b74a48b0c85df15da3487ff070.zip | |
Add loading icon on avatar
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/jquery.avatar.js | 3 | ||||
| -rw-r--r-- | core/js/placeholder.js | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js index b44fe5fd631..0d4c063a91a 100644 --- a/core/js/jquery.avatar.js +++ b/core/js/jquery.avatar.js @@ -140,12 +140,13 @@ // If the new image loads successfully set it. img.onload = function() { - $div.show(); $div.text(''); $div.append(img); $div.clearimageplaceholder(); }; + $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 f173e738676..5cf7b9095ad 100644 --- a/core/js/placeholder.js +++ b/core/js/placeholder.js @@ -2,7 +2,7 @@ * ownCloud * * @author John Molakvoæ - * @copyright 2016 John Molakvoæ <fremulon@protonmail.com> + * @copyright 2016-2017 John Molakvoæ <skjnldsv@protonmail.com> * @author Morris Jobke * @copyright 2013 Morris Jobke <morris.jobke@gmail.com> * @@ -47,7 +47,7 @@ * <div id="albumart" style="background-color: hsl(123, 90%, 65%); ... ">A</div> * */ - + /* * Alternatively, you can use the prototype function to convert your string to hsl colors: * @@ -156,5 +156,6 @@ this.css('text-align', ''); this.css('line-height', ''); this.css('font-size', ''); + this.removeClass('icon-loading'); }; }(jQuery)); |