mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

display avatar (if enabled) alongside displaynames 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2016-10-18 17:23:52 +02:00
parent 70bd6cafd4
commit 185433967e
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/comments/css/comments.css
View File

@ -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;

9
apps/comments/js/commentstabview.js
View File

@ -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.