Merge pull request #1102 from jitsi/limit_display_name

Limit long display names
This commit is contained in:
Дамян Минков 2016-11-09 10:51:46 -06:00 committed by GitHub
commit 70c3c1a21c
2 changed files with 20 additions and 7 deletions

View File

@ -45,6 +45,12 @@ const commands = {
CUSTOM_ROLE: "custom-role"
};
/**
* Max length of the display names. If we receive longer display name the
* additional chars are going to be cut.
*/
const MAX_DISPLAY_NAME_LENGTH = 50;
/**
* Open Connection. When authentication failed it shows auth dialog.
* @param roomName the room name to use
@ -273,15 +279,16 @@ function changeLocalEmail(email = '') {
* @param nickname {string} the new display name
*/
function changeLocalDisplayName(nickname = '') {
nickname = nickname.trim();
const formattedNickname
= nickname.trim().substr(0, MAX_DISPLAY_NAME_LENGTH);
if (nickname === APP.settings.getDisplayName()) {
if (formattedNickname === APP.settings.getDisplayName()) {
return;
}
APP.settings.setDisplayName(nickname);
room.setDisplayName(nickname);
APP.UI.changeDisplayName(APP.conference.getMyUserId(), nickname);
APP.settings.setDisplayName(formattedNickname);
room.setDisplayName(formattedNickname);
APP.UI.changeDisplayName(APP.conference.getMyUserId(), formattedNickname);
}
class ConferenceConnector {
@ -1252,8 +1259,10 @@ export default {
});
room.on(ConferenceEvents.DISPLAY_NAME_CHANGED, (id, displayName) => {
APP.API.notifyDisplayNameChanged(id, displayName);
APP.UI.changeDisplayName(id, displayName);
const formattedDisplayName
= displayName.substr(0, MAX_DISPLAY_NAME_LENGTH);
APP.API.notifyDisplayNameChanged(id, formattedDisplayName);
APP.UI.changeDisplayName(id, formattedDisplayName);
});
room.on(ConferenceEvents.PARTICIPANT_PROPERTY_CHANGED,

View File

@ -107,6 +107,10 @@
float: left;
padding-left: 5px;
font-weight: bold;
white-space: nowrap;
text-overflow: ellipsis;
width: 95%;
overflow: hidden;
}
#chat_container .timestamp {