IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-08 04:04:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FEATURE: SVG letter avatars (based on @eviltrout's spike)"

Browse Source 
This reverts commit cd77465788.
This commit is contained in:
Régis Hanol
2015-09-11 00:23:52 +02:00
parent cd77465788
commit e43034f08f
8 changed files with 29 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse/lib/avatar-template.js.es6
+10 -4
View File
@@ -4,7 +4,6 @@ let _splitAvatars;
function defaultAvatar(username) {
const defaultAvatars = Discourse.SiteSettings.default_avatars;
if (defaultAvatars && defaultAvatars.length) {
_splitAvatars = _splitAvatars || defaultAvatars.split("\n");
@@ -14,13 +13,20 @@ function defaultAvatar(username) {
}
}
const extension = Discourse.SiteSettings.svg_letter_avatars ? "svg" : "png";
return Discourse.getURLWithCDN(`/letter_avatar/${username.toLowerCase()}/{size}/${Discourse.LetterAvatarVersion}.${extension}`);
return Discourse.getURLWithCDN("/letter_avatar/" +
username.toLowerCase() +
"/{size}/" +
Discourse.LetterAvatarVersion + ".png");
}
export default function(username, uploadedAvatarId) {
if (uploadedAvatarId) {
return Discourse.getURLWithCDN(`/user_avatar/${Discourse.BaseUrl}/${username.toLowerCase()}/{size}/${uploadedAvatarId}.png`);
return Discourse.getURLWithCDN("/user_avatar/" +
Discourse.BaseUrl +
"/" +
username.toLowerCase() +
"/{size}/" +
uploadedAvatarId + ".png");
}
return defaultAvatar(username);
}