Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: use provided avatar_template instead of always computing it

This commit is contained in:
Régis Hanol 2015-05-29 10:19:51 +02:00
parent c3227b69fa
commit 95fb32f3e5
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/discourse/helpers/application_helpers.js
View File

@ -14,17 +14,15 @@ Em.Handlebars.helper('bound-avatar', function(user, size, uploadId) {
if (Em.isEmpty(user)) {
return new safe("<div class='avatar-placeholder'></div>");
}
var username = Em.get(user, 'username');
if(arguments.length < 4){
uploadId = Em.get(user, 'uploaded_avatar_id');
}
if (arguments.length < 4) { uploadId = Em.get(user, 'uploaded_avatar_id'); }
return new safe(Discourse.Utilities.avatarImg({
size: size,
avatarTemplate: avatarTemplate(username, uploadId)
}));
}, 'username', 'uploaded_avatar_id');
var avatar = Em.get(user, 'avatar_template') || avatarTemplate(username, uploadId);
return new safe(Discourse.Utilities.avatarImg({ size: size, avatarTemplate: avatar }));
}, 'username', 'uploaded_avatar_id', 'avatar_template');
/*
* Used when we only have a template