Skip to content
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.

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

[WEB] add UI for transcription #3213

Merged
merged 11 commits into from
Jul 26, 2018
10 changes: 9 additions & 1 deletion conference.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ import {
getAvatarURLByParticipantId,
getLocalParticipant,
getParticipantById,
hiddenParticipantJoined,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drive-by observation: we should not need these. A participant can have a hidden property if that's needed. Or alternatively we could filter transcribers before dispatching the participantJoined action.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I disagree; currently a PARTICIPANT_JOINED event triggers whatever logic is required for a new participant, such as displaying it in the filmstrip. All this code should then first check if it's not actually a hidden participant?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And we can't filter for transcriber because the displayname will not be set until a presence which comes later...

hiddenParticipantLeft,
localParticipantConnectionStatusChanged,
localParticipantRoleChanged,
MAX_DISPLAY_NAME_LENGTH,
Expand Down Expand Up @@ -1654,10 +1656,13 @@ export default {
room.on(JitsiConferenceEvents.PARTCIPANT_FEATURES_CHANGED,
user => APP.UI.onUserFeaturesChanged(user));
room.on(JitsiConferenceEvents.USER_JOINED, (id, user) => {
const displayName = user.getDisplayName();

if (user.isHidden()) {
APP.store.dispatch(hiddenParticipantJoined(id, displayName));

return;
}
const displayName = user.getDisplayName();

APP.store.dispatch(participantJoined({
botType: user.getBotType(),
Expand All @@ -1682,8 +1687,11 @@ export default {

room.on(JitsiConferenceEvents.USER_LEFT, (id, user) => {
if (user.isHidden()) {
APP.store.dispatch(hiddenParticipantLeft(id));

return;
}

APP.store.dispatch(participantLeft(id, room));
logger.log('USER %s LEFT', id, user);
APP.API.notifyUserLeft(id);
Expand Down
4 changes: 4 additions & 0 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ var config = {
// Whether to enable live streaming or not.
// liveStreamingEnabled: false,

// Transcription (in interface_config,
// subtitles and buttons can be configured)
transcribingEnabled: false,

// Misc

// Default value for the channel "last N" attribute. -1 for unlimited.
Expand Down
4 changes: 4 additions & 0 deletions css/_font.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

.icon-cc:before {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this icon really exist? If so where is it used?

content: "\e92f";
}
.icon-arrow_back:before {
content: "\e5c4";
}
Expand Down
Binary file modified fonts/jitsi.eot
Binary file not shown.
1 change: 1 addition & 0 deletions fonts/jitsi.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fonts/jitsi.ttf
Binary file not shown.
Binary file modified fonts/jitsi.woff
Binary file not shown.
Loading