dani
/
vroom
mirror of https://github.com/dani/vroom.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't display peer ID if the peer has no displayName

Browse Source
master
Daniel Berteaud 11 years ago
parent ccd1f68a87
commit 3c19a340a2
1 changed files with 6 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      public/js/vroom.js

10
public/js/vroom.js
Unescape View File

@ -925,13 +925,14 @@ function initVroom(room) {
if (data.roomType == 'screen' || peers[data.id].role != 'owner'){ if (data.roomType == 'screen' || peers[data.id].role != 'owner'){
return; return;
} }
var who = (peers[data.id].hasName) ? peers[data.id].displayName : locale.A_ROOM_ADMIN;
if (data.payload.action == 'set'){ if (data.payload.action == 'set'){
$.notify(sprintf(locale.PASSWORD_PROTECT_ON_BY_s, stringEscape(peers[data.id].displayName)), 'info'); $.notify(sprintf(locale.PASSWORD_PROTECT_ON_BY_s, stringEscape(who)), 'info');
$('#joinPassLabel').addClass('btn-danger active'); $('#joinPassLabel').addClass('btn-danger active');
$('#joinPassButton').prop('checked', true); $('#joinPassButton').prop('checked', true);
} }
else{ else{
$.notify(sprintf(locale.PASSWORD_PROTECT_OFF_BY_s, stringEscape(peers[data.id].displayName)), 'info'); $.notify(sprintf(locale.PASSWORD_PROTECT_OFF_BY_s, stringEscape(who)), 'info');
$('#joinPassLabel').removeClass('btn-danger active'); $('#joinPassLabel').removeClass('btn-danger active');
$('#joinPassButton').prop('checked', false); $('#joinPassButton').prop('checked', false);
} }
@ -941,13 +942,14 @@ function initVroom(room) {
return; return;
} }
if (peers.local.role == 'owner'){ if (peers.local.role == 'owner'){
var who = (peers[data.id].hasName) ? peers[data.id].displayName : locale.A_ROOM_ADMIN;
if (data.payload.action == 'set'){ if (data.payload.action == 'set'){
$.notify(sprintf(locale.OWNER_PASSWORD_CHANGED_BY_s, stringEscape(peers[data.id].displayName)), 'warn'); $.notify(sprintf(locale.OWNER_PASSWORD_CHANGED_BY_s, stringEscape(who)), 'warn');
$('#persistentLabel').addClass('btn-danger active'); $('#persistentLabel').addClass('btn-danger active');
$('#persistentButton').prop('checked', true); $('#persistentButton').prop('checked', true);
} }
else{ else{
$.notify(sprintf(locale.OWNER_PASSWORD_REMOVED_BY_s, stringEscape(peers[data.id].displayName)), 'warn'); $.notify(sprintf(locale.OWNER_PASSWORD_REMOVED_BY_s, stringEscape(who)), 'warn');
$('#persistentLabel').removeClass('btn-danger active'); $('#persistentLabel').removeClass('btn-danger active');
$('#persistentButton').prop('checked', false); $('#persistentButton').prop('checked', false);
} }

Write Preview
Loading…
Cancel
Save