Merge branch 'master' of https://github.com/imbox-technologies/jitsi-…

…meet * 'master' of https://github.com/imbox-technologies/jitsi-meet: feat(dynamic-branding): Add branding option for virtual backgrounds fix(av-moderation) Stop screensharing and video on moderation start fix(lang) update french translation fix: Speaker stats search fix jitsi#9751 (jitsi#10019) chore(interface-config) Group deprecated configs fix(toolbar) Fix toolbar always visible; refactors fix(av-moderation) Only stop screensharing on Stop everyone's video fix(subject): Keep subject centered when chat panel is open fix(chat): Hide scroll bar on chat input fix(ios) create audio track early fix(lang) update occitan translation fix(rn) add default value when retrieving e2ee redux state fix(ios) fix black screen when using Bluetooth in iOS 15 fix(toolbox) don't mix web and native actions on the same file fix(lobby) don't mix web and native actions on the same file fix(participants-pane) bring back lobby reject button Fix stop everyone's video fix(av-moderation) - Mute/ stop video except no longer change moderation status
imbox-technologies · Oct 7, 2021 · 4ddd309 · 4ddd309
2 parents 91adc70 + f9cc813
commit 4ddd309
Show file tree

Hide file tree

Showing 40 changed files with 1,092 additions and 799 deletions.
diff --git a/conference.js b/conference.js
@@ -1503,14 +1503,14 @@ export default {
      *
      * @param {boolean} didHaveVideo indicates if there was a camera video being
      * used, before switching to screen sharing.
-     * @param {boolean} wasVideoMuted indicates if the video was muted, before
-     * switching to screen sharing.
+     * @param {boolean} ignoreDidHaveVideo indicates if the camera video should be
+     * ignored when switching screen sharing off.
      * @return {Promise} resolved after the screen sharing is turned off, or
      * rejected with some error (no idea what kind of error, possible GUM error)
      * in case it fails.
      * @private
      */
-    async _turnScreenSharingOff(didHaveVideo) {
+    async _turnScreenSharingOff(didHaveVideo, ignoreDidHaveVideo) {
         this._untoggleScreenSharing = null;
         this.videoSwitchInProgress = true;
 
@@ -1554,7 +1554,7 @@ export default {
 
         APP.store.dispatch(setScreenAudioShareState(false));
 
-        if (didHaveVideo) {
+        if (didHaveVideo && !ignoreDidHaveVideo) {
             promise = promise.then(() => createLocalTracksF({ devices: [ 'video' ] }))
                 .then(([ stream ]) => {
                     logger.debug(`_turnScreenSharingOff using ${stream} for useVideoStream`);
@@ -1605,9 +1605,10 @@ export default {
      * @param {Array<string>} [options.desktopSharingSources] - Array with the
      * sources that have to be displayed in the desktop picker window ('screen',
      * 'window', etc.).
+     * @param {boolean} ignoreDidHaveVideo - if true ignore if video was on when sharing started.
      * @return {Promise.<T>}
      */
-    async toggleScreenSharing(toggle = !this._untoggleScreenSharing, options = {}) {
+    async toggleScreenSharing(toggle = !this._untoggleScreenSharing, options = {}, ignoreDidHaveVideo) {
         logger.debug(`toggleScreenSharing: ${toggle}`);
         if (this.videoSwitchInProgress) {
             return Promise.reject('Switch in progress.');
@@ -1633,7 +1634,7 @@ export default {
         }
 
         return this._untoggleScreenSharing
-            ? this._untoggleScreenSharing()
+            ? this._untoggleScreenSharing(ignoreDidHaveVideo)
             : Promise.resolve();
     },
 
@@ -2476,8 +2477,8 @@ export default {
         });
 
         APP.UI.addListener(
-            UIEvents.TOGGLE_SCREENSHARING, ({ enabled, audioOnly }) => {
-                this.toggleScreenSharing(enabled, { audioOnly });
+            UIEvents.TOGGLE_SCREENSHARING, ({ enabled, audioOnly, ignoreDidHaveVideo }) => {
+                this.toggleScreenSharing(enabled, { audioOnly }, ignoreDidHaveVideo);
             }
         );
     },

diff --git a/config.js b/config.js
@@ -545,6 +545,19 @@ var config = {
     //    '__end'
     // ],
 
+    // Holds values related to toolbar visibility control.
+    // toolbarConfig: {
+    //     // Moved from interfaceConfig.INITIAL_TOOLBAR_TIMEOUT
+    //     // The initial numer of miliseconds for the toolbar buttons to be visible on screen.
+    //     initialTimeout: 20000,
+    //     // Moved from interfaceConfig.TOOLBAR_TIMEOUT
+    //     // Number of miliseconds for the toolbar buttons to be visible on screen.
+    //     timeout: 4000,
+    //     // Moved from interfaceConfig.TOOLBAR_ALWAYS_VISIBLE
+    //     // Whether toolbar should be always visible or should hide after x miliseconds.
+    //     alwaysVisible: false
+    // },
+
     // Toolbar buttons which have their click event exposed through the API on
     // `toolbarButtonClicked` event instead of executing the normal click routine.
     // buttonsWithNotifyClick: [
@@ -896,6 +909,10 @@ var config = {
     */
     // dynamicBrandingUrl: '',
 
+    // When true the user cannot add more images to be used as virtual background.
+    // Only the default ones from will be available.
+    // disableAddingBackgroundImages: false,
+
     // Sets the background transparency level. '0' is fully transparent, '1' is opaque.
     // backgroundAlpha: 1,
 

diff --git a/css/_chat.scss b/css/_chat.scss
@@ -213,6 +213,7 @@
 }
 
 #usermsg {
+    -ms-overflow-style: none;
     border: 0px none;
     border-radius:0;
     box-shadow: none;
@@ -221,8 +222,13 @@
     padding: 10px;
     overflow-y: auto;
     resize: none;
+    scrollbar-width: none;
     width: 100%;
     word-break: break-word;
+
+    &::-webkit-scrollbar {
+        display: none;
+    }
 }
 
 #usermsg:hover {

diff --git a/css/_subject.scss b/css/_subject.scss
@@ -75,3 +75,7 @@
     top: 0;
     height: 48px;
 }
+
+.shift-right .details-container {
+    margin-left: calc(#{$sidebarWidth} / 2);
+}
diff --git a/interface_config.js b/interface_config.js
@@ -26,11 +26,6 @@ var interfaceConfig = {
 
     CLOSE_PAGE_GUEST_HINT: false, // A html text to be shown to guests on the close page, false disables it
 
-    // Connection indicators (
-    // CONNECTION_INDICATOR_AUTO_HIDE_ENABLED,
-    // CONNECTION_INDICATOR_AUTO_HIDE_TIMEOUT,
-    // CONNECTION_INDICATOR_DISABLED) got moved to config.js.
-
     DEFAULT_BACKGROUND: '#474747',
     DEFAULT_LOCAL_DISPLAY_NAME: 'me',
     DEFAULT_LOGO_URL: 'images/watermark.svg',
@@ -39,9 +34,6 @@ var interfaceConfig = {
 
     DISABLE_DOMINANT_SPEAKER_INDICATOR: false,
 
-    // Deprecated. Please use disableModeratorIndicator from config.js
-    // DISABLE_FOCUS_INDICATOR: false,
-
     /**
      * If true, notifications regarding joining/leaving are no longer displayed.
      */
@@ -97,7 +89,6 @@ var interfaceConfig = {
      */
     HIDE_INVITE_MORE_HEADER: false,
 
-    INITIAL_TOOLBAR_TIMEOUT: 20000,
     JITSI_WATERMARK_LINK: 'https://jitsi.org',
 
     LANG_DETECTION: true, // Allow i18n to detect the system language
@@ -183,16 +174,6 @@ var interfaceConfig = {
      */
     SUPPORT_URL: 'https://community.jitsi.org/',
 
-    TOOLBAR_ALWAYS_VISIBLE: false,
-
-    /**
-     * DEPRECATED!
-     * This config was moved to config.js as `toolbarButtons`.
-     */
-    // TOOLBAR_BUTTONS: [],
-
-    TOOLBAR_TIMEOUT: 4000,
-
     // Browsers, in addition to those which do not fully support WebRTC, that
     // are not supported and should show the unsupported browser page.
     UNSUPPORTED_BROWSERS: [],
@@ -257,6 +238,28 @@ var interfaceConfig = {
      PHONE_NUMBER_REGEX
     */
 
+    // -----------------DEPRECATED CONFIGS BELOW THIS LINE-----------------------------
+
+    // Connection indicators (
+    // CONNECTION_INDICATOR_AUTO_HIDE_ENABLED,
+    // CONNECTION_INDICATOR_AUTO_HIDE_TIMEOUT,
+    // CONNECTION_INDICATOR_DISABLED) got moved to config.js.
+
+    // Please use disableModeratorIndicator from config.js
+    // DISABLE_FOCUS_INDICATOR: false,
+
+    // Moved to config.js as `toolbarConfig.initialTimeout`.
+    // INITIAL_TOOLBAR_TIMEOUT: 20000,
+
+    // Moved to config.js as `toolbarConfig.alwaysVisible`.
+    // TOOLBAR_ALWAYS_VISIBLE: false,
+
+    // This config was moved to config.js as `toolbarButtons`.
+    // TOOLBAR_BUTTONS: [],
+
+    // Moved to config.js as `toolbarConfig.timeout`.
+    // TOOLBAR_TIMEOUT: 4000,
+
     // Allow all above example options to include a trailing comma and
     // prevent fear when commenting out the last value.
     // eslint-disable-next-line sort-keys

diff --git a/lang/main-fr.json b/lang/main-fr.json
@@ -248,6 +248,8 @@
     "micPermissionDeniedError": "Vous n'avez pas autorisé l'utilisation de votre microphone. Vous pouvez toujours participer à la conférence, mais les autres ne vont pas vous entendre. Utilisez le bouton du microphone dans la barre d'adresse pour résoudre ce problème.",
     "micTimeoutError": "Impossible de démarrer la source audio. Délai dépassé!",
     "micUnknownError": "Vous ne pouvez pas utiliser le microphone pour une raison inconnue.",
+    "moderationAudioLabel": "Autoriser les participants à réactiver leur micro",
+    "moderationVideoLabel": "Autoriser les participants à démarrer leur vidéo",
     "muteEveryoneElseDialog": "Une fois leur micro coupé, vous ne pourrez plus le réactiver, mais ils pourront l'activer par eux-mêmes à tout moment.",
     "muteEveryoneElseTitle": "Couper le micro de tout le monde sauf de {{whom}} ?",
     "muteEveryoneDialog": "Êtes-vous sûr de vouloir couper les micros de tout le monde ? Vous ne pourrez plus réactiver leur micro, mais ils pourront l'activer par eux-mêmes à tout moment.",
@@ -563,12 +565,21 @@
     "close": "Fermer",
     "headings": {
       "lobby": "Salle d'attente ({{count}})",
-      "participantsList": "Participants de la réunion ({{count}})"
+      "participantsList": "Participants de la réunion ({{count}})",
+      "waitingLobby": "Dans la salle d'attente ({{count}})"
     },
     "actions": {
+      "allow": "Autoriser les participant à:",
+      "blockEveryoneMicCamera": "Bloquer tous les micros et caméras",
       "invite": "Inviter quelqu'un",
-      "muteAll": "couper le micro de tout le monde",
-      "stopVideo": "couper la vidéo"
+      "askUnmute": "Demander de réactiver le micro",
+      "mute": "Couper le micro",
+      "muteAll": "Couper le micro de tout le monde",
+      "muteEveryoneElse": "Couper le micro de tous les autres",
+      "startModeration": "Réactiver son micro ou démarrer sa vidéo",
+      "stopEveryonesVideo": "Couper toutes les caméras",
+      "stopVideo": "Couper la vidéo",
+      "unblockEveryoneMicCamera": "Débloquer tous les micros et caméras"
     }
   },
   "passwordSetRemotely": "défini par un autre participant",