diff options
| author | Joas Schilling <coding@schilljs.com> | 2018-03-20 13:33:39 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2018-03-22 11:54:56 +0300 |
| commit | 160f431bc289f936b7b4cba960849c403c57ffd5 (patch) | |
| tree | 05d2203fbe8522e8f7a5762a28440ce29d14ca45 /js/webrtc.js | |
| parent | 1ff8ffad72a5bf7258e7c028e1dafe740bb9d6df (diff) | |
Simplify guest avatar handling
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'js/webrtc.js')
| -rw-r--r-- | js/webrtc.js | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/js/webrtc.js b/js/webrtc.js index 1de3cc080..af591c467 100644 --- a/js/webrtc.js +++ b/js/webrtc.js @@ -740,16 +740,10 @@ var spreedPeerConnectionTable = []; if (userId && userId.length) { avatar.avatar(userId, 128); nameIndicator.text(peer.nick); - } else if (peer.nick) { - avatar.imageplaceholder(peer.nick, undefined, 128); - nameIndicator.text(peer.nick); - } else if (guestName && guestName.length > 0) { - avatar.imageplaceholder(guestName, undefined, 128); - nameIndicator.text(guestName); } else { - avatar.imageplaceholder('?', undefined, 128); + avatar.imageplaceholder('?', peer.nick || guestName, 128); avatar.css('background-color', '#b9b9b9'); - nameIndicator.text(t('spreed', 'Guest')); + nameIndicator.text(peer.nick || guestName || t('spreed', 'Guest')); } $(videoContainer).prepend(video); @@ -914,16 +908,14 @@ var spreedPeerConnectionTable = []; var screenNameIndicator = $(screen).find('.nameIndicator'); if (!data.name) { - videoNameIndicator.text(t('spreed', 'Guest')); - videoAvatar.imageplaceholder('?', undefined, 128); - videoAvatar.css('background-color', '#b9b9b9'); screenNameIndicator.text(t('spreed', "Guest's screen")); } else { - videoNameIndicator.text(data.name); - videoAvatar.imageplaceholder(data.name, undefined, 128); screenNameIndicator.text(t('spreed', "{participantName}'s screen", {participantName: data.name})); guestNamesTable[data.id] = data.name; } + videoNameIndicator.text(data.name || t('spreed', 'Guest')); + videoAvatar.imageplaceholder('?', data.name, 128); + videoAvatar.css('background-color', '#b9b9b9'); if (latestSpeakerId === data.id) { OCA.SpreedMe.speakers.updateVideoContainerDummy(data.id); |