Skip to content

Fix avatars of users in guest sytem messages #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 6 commits into from
Nov 12, 2018
Merged

Fix avatars of users in guest sytem messages #1240

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0733968
Rename "data-user" to "data-user-id"
danxuliu Nov 9, 2018
ca90cb2
Unify "data-username" and "data-user-id" as the later
danxuliu Nov 9, 2018
8dbd7ca
Unify "data-displayname" and "data-user-display-name" as the later
danxuliu Nov 9, 2018
0ddcf61
Get the user id from the model for the contacts menu of the author
danxuliu Nov 9, 2018
21d791a
Fix avatars of users mentioned in guest messages
nickvergessen Oct 2, 2018
78c1fae
Make guest avatars grey again
nickvergessen Nov 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Make guest avatars grey again 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @danxuliu
nickvergessen authored and danxuliu committed Nov 9, 2018
commit 78c1fae7a2b6db3d409a08b77d40bf84692e80e1
2 changes: 1 addition & 1 deletion js/views/chatview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
'<li class="comment{{#if isNotSystemMessage}}{{else}} systemMessage{{/if}}" data-id="{{id}}">' +
' <div class="authorRow{{#if isUserAuthor}} currentUser{{/if}}{{#if isGuest}} guestUser{{/if}}">' +
' {{#if isNotSystemMessage}}' +
' <div class="avatar" data-user-id="{{actorId}}" data-user-display-name="{{actorDisplayName}}"> </div>' +
' <div class="avatar" data-user-id="{{#if isGuest}}{{else}}{{actorId}}{{/if}}" data-user-display-name="{{actorDisplayName}}"> </div>' +
' <div class="author">{{actorDisplayName}}</div>' +
' {{/if}}' +
' <div class="date has-tooltip{{#if relativeDate}} live-relative-timestamp{{/if}}" data-timestamp="{{timestamp}}" title="{{altDate}}">{{date}}</div>' +
Expand Down