From 47f631b0597a46cd73bde6ddb54e6b5b0cc74fd6 Mon Sep 17 00:00:00 2001
From: Martin Klampfer <martin.klampfer@fairkom.eu>
Date: Tue, 15 Jun 2021 12:58:39 +0200
Subject: [PATCH] added rxjs to package.json
disabled "you are muted" overlay
---
.../audio/audio-controls/component.jsx | 6 ----
.../ui/services/audio-manager/index.js | 1 +
bigbluebutton-html5/package-lock.json | 31 +++++++++++++------
bigbluebutton-html5/package.json | 1 +
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx
index 00ada29c7e..c64971b3b8 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx
@@ -207,12 +207,6 @@ class AudioControls extends PureComponent {
return (
<span className={styles.container}>
- {isVoiceUser && inputStream && muteAlertEnabled && !listenOnly && muted ? (
- <MutedAlert {...{
- muted, inputStream, isViewer, isPresenter,
- }}
- />
- ) : null}
{(showMute && isVoiceUser ) && ! translatorChannelOpen ? toggleMuteBtn : null}
{
this.renderJoinLeaveButton()
diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
index 69b6472400..755322848f 100755
--- a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
+++ b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js
@@ -830,6 +830,7 @@ class AudioManager {
}
async openTranslatorChannel(languageExtension, onConnected) {
+
if( this.translatorBridge.activeSession ) {
this.translatorChannelOpen = false;
this.translatorBridge.exitAudio();
diff --git a/bigbluebutton-html5/package-lock.json b/bigbluebutton-html5/package-lock.json
index f93cb745fa..bed124aebd 100644
--- a/bigbluebutton-html5/package-lock.json
+++ b/bigbluebutton-html5/package-lock.json
@@ -8004,6 +8004,15 @@
"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
"dev": true
},
+ "rxjs": {
+ "version": "6.6.7",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+ "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+ "dev": true,
+ "requires": {
+ "tslib": "^1.9.0"
+ }
+ },
"string-width": {
"version": "4.2.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
@@ -8033,6 +8042,12 @@
"has-flag": "^4.0.0"
}
},
+ "tslib": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+ "dev": true
+ },
"wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -10815,12 +10830,11 @@
"dev": true
},
"rxjs": {
- "version": "6.6.7",
- "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
- "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
- "dev": true,
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.1.0.tgz",
+ "integrity": "sha512-gCFO5iHIbRPwznl6hAYuwNFld8W4S2shtSJIqG27ReWXo9IWrCyEICxUA+6vJHwSR/OakoenC4QsDxq50tzYmw==",
"requires": {
- "tslib": "^1.9.0"
+ "tslib": "~2.1.0"
}
},
"safe-buffer": {
@@ -12187,10 +12201,9 @@
}
},
"tslib": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
- "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
- "dev": true
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
+ "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
},
"tunnel-agent": {
"version": "0.6.0",
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
index 46a606fcd9..57aaf73fdc 100755
--- a/bigbluebutton-html5/package.json
+++ b/bigbluebutton-html5/package.json
@@ -70,6 +70,7 @@
"react-virtualized": "^9.22.3",
"reconnecting-websocket": "~v4.1.10",
"redis": "^3.1.2",
+ "rxjs": "^7.1.0",
"sanitize-html": "2.3.3",
"sdp-transform": "2.7.0",
"string-hash": "~1.1.3",
--
GitLab