Skip to content

Commit

Permalink
[WEB] add UI for transcription (#3213)
Browse files Browse the repository at this point in the history
* [WEB] add UI for transcription

* add analytics event for button, do not use global APP object

* use props instead of state, use local conference to kick participant

* put imports in alphabetical order

* add translation for TranscribingLabel

* fix merge conflict

* add closed caption button

* purge OverFlowMenuItem which starts and stops Transcription

* readd closed caption icon and fix small issues due to purge

* delete unused icon in _font.scss
  • Loading branch information
nikvaessen authored and virtuacoplenny committed Jul 26, 2018
1 parent 39f1958 commit b8daf0a
Show file tree
Hide file tree
Showing 26 changed files with 1,191 additions and 309 deletions.
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,
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,7 @@
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

.icon-arrow_back:before {
content: "\e5c4";
}
Expand Down Expand Up @@ -216,3 +217,6 @@
.icon-tiles-one:before {
content: "\e92f";
}
.icon-closed_caption:before {
content: "\e930";
}
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

0 comments on commit b8daf0a

Please sign in to comment.