Browse Source

feat(ConferenceTimer): Add config option to hide.

j8
Hristo Terezov 4 years ago
parent
commit
5cae5985c0

+ 6
- 0
config.js View File

616
     // otherwise the app doesn't render it.
616
     // otherwise the app doesn't render it.
617
     // moderatedRoomServiceUrl: 'https://moderated.jitsi-meet.example.com',
617
     // moderatedRoomServiceUrl: 'https://moderated.jitsi-meet.example.com',
618
 
618
 
619
+    // Hides the conference timer.
620
+    // hideConferenceTimer: true,
621
+
622
+    // Sets the conference subject
623
+    // subject: 'Conference Subject',
624
+
619
     // List of undocumented settings used in jitsi-meet
625
     // List of undocumented settings used in jitsi-meet
620
     /**
626
     /**
621
      _immediateReloadThreshold
627
      _immediateReloadThreshold

+ 1
- 0
react/features/base/config/configWhitelist.js View File

116
     'forceJVB121Ratio',
116
     'forceJVB121Ratio',
117
     'gatherStats',
117
     'gatherStats',
118
     'googleApiApplicationClientID',
118
     'googleApiApplicationClientID',
119
+    'hideConferenceTimer',
119
     'hiddenDomain',
120
     'hiddenDomain',
120
     'hideLobbyButton',
121
     'hideLobbyButton',
121
     'hosts',
122
     'hosts',

+ 2
- 1
react/features/conference/components/native/NavigationBar.js View File

96
  */
96
  */
97
 function _mapStateToProps(state) {
97
 function _mapStateToProps(state) {
98
     return {
98
     return {
99
-        _conferenceTimerEnabled: getFeatureFlag(state, CONFERENCE_TIMER_ENABLED, true),
99
+        _conferenceTimerEnabled:
100
+            getFeatureFlag(state, CONFERENCE_TIMER_ENABLED, true) && !state['features/base/config'].hideConferenceTimer,
100
         _meetingName: getConferenceName(state),
101
         _meetingName: getConferenceName(state),
101
         _meetingNameEnabled: getFeatureFlag(state, MEETING_NAME_ENABLED, true),
102
         _meetingNameEnabled: getFeatureFlag(state, MEETING_NAME_ENABLED, true),
102
         _visible: isToolboxVisible(state)
103
         _visible: isToolboxVisible(state)

+ 11
- 3
react/features/conference/components/web/Subject.js View File

16
 type Props = {
16
 type Props = {
17
 
17
 
18
     /**
18
     /**
19
-     * Whether then participant count should be shown or not.
19
+     * Whether the conference timer should be shown or not.
20
+     */
21
+    _hideConferenceTimer: Boolean,
22
+
23
+    /**
24
+     * Whether the participant count should be shown or not.
20
      */
25
      */
21
     _showParticipantCount: boolean,
26
     _showParticipantCount: boolean,
22
 
27
 
46
      * @returns {ReactElement}
51
      * @returns {ReactElement}
47
      */
52
      */
48
     render() {
53
     render() {
49
-        const { _showParticipantCount, _subject, _visible } = this.props;
54
+        const { _hideConferenceTimer, _showParticipantCount, _subject, _visible } = this.props;
50
 
55
 
51
         return (
56
         return (
52
             <div className = { `subject ${_visible ? 'visible' : ''}` }>
57
             <div className = { `subject ${_visible ? 'visible' : ''}` }>
53
                 <span className = 'subject-text'>{ _subject }</span>
58
                 <span className = 'subject-text'>{ _subject }</span>
54
                 { _showParticipantCount && <ParticipantsCount /> }
59
                 { _showParticipantCount && <ParticipantsCount /> }
55
-                <ConferenceTimer />
60
+                { !_hideConferenceTimer && <ConferenceTimer /> }
56
             </div>
61
             </div>
57
         );
62
         );
58
     }
63
     }
65
  * @param {Object} state - The Redux state.
70
  * @param {Object} state - The Redux state.
66
  * @private
71
  * @private
67
  * @returns {{
72
  * @returns {{
73
+ *     _hideConferenceTimer: boolean,
74
+ *     _showParticipantCount: boolean,
68
  *     _subject: string,
75
  *     _subject: string,
69
  *     _visible: boolean
76
  *     _visible: boolean
70
  * }}
77
  * }}
73
     const participantCount = getParticipantCount(state);
80
     const participantCount = getParticipantCount(state);
74
 
81
 
75
     return {
82
     return {
83
+        _hideConferenceTimer: Boolean(state['features/base/config'].hideConferenceTimer),
76
         _showParticipantCount: participantCount > 2,
84
         _showParticipantCount: participantCount > 2,
77
         _subject: getConferenceName(state),
85
         _subject: getConferenceName(state),
78
         _visible: isToolboxVisible(state) && participantCount > 1
86
         _visible: isToolboxVisible(state) && participantCount > 1

Loading…
Cancel
Save