display avatar (if enabled) alongside displaynames
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
parent
70bd6cafd4
commit
185433967e
|
@ -64,6 +64,10 @@
|
|||
line-height: 32px;
|
||||
}
|
||||
|
||||
#commentsTabView .comment .message .avatar {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
#activityTabView li.comment.collapsed .activitymessage,
|
||||
#commentsTabView .comment.collapsed .message {
|
||||
white-space: pre-wrap;
|
||||
|
|
|
@ -257,10 +257,17 @@
|
|||
for(var i in mentions) {
|
||||
var mention = '@' + mentions[i].mentionId;
|
||||
|
||||
var avatar = '';
|
||||
if(this._avatarsEnabled) {
|
||||
avatar = '<div class="avatar" '
|
||||
+ 'data-user="' + _.escape(mentions[i].mentionId) + '"'
|
||||
+' data-user-display-name="'
|
||||
+ _.escape(mentions[i].mentionDisplayName) + '"></div>';
|
||||
}
|
||||
|
||||
// escape possible regex characters in the name
|
||||
mention = mention.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
var displayName = '<b>'+ _.escape(mentions[i].mentionDisplayName)+'</b>';
|
||||
var displayName = avatar + ' <strong>'+ _.escape(mentions[i].mentionDisplayName)+'</strong>';
|
||||
|
||||
// replace every mention either at the start of the input or after a whitespace
|
||||
// followed by a non-word character.
|
||||
|
|
Loading…
Reference in New Issue