Procházet zdrojové kódy

welcome: hide tabs if nothing to show

j8
James Baird před 5 roky
rodič
revize
9fdc18d1ec
Žádný účet není propojen s e-mailovou adresou tvůrce revize

+ 7
- 0
react/features/welcome/components/AbstractWelcomePage.js Zobrazit soubor

7
 import { createWelcomePageEvent, sendAnalytics } from '../../analytics';
7
 import { createWelcomePageEvent, sendAnalytics } from '../../analytics';
8
 import { appNavigate } from '../../app';
8
 import { appNavigate } from '../../app';
9
 import { isCalendarEnabled } from '../../calendar-sync';
9
 import { isCalendarEnabled } from '../../calendar-sync';
10
+import { isRecentListEnabled } from '../../recent-list/functions';
10
 
11
 
11
 /**
12
 /**
12
  * {@code AbstractWelcomePage}'s React {@code Component} prop types.
13
  * {@code AbstractWelcomePage}'s React {@code Component} prop types.
18
      */
19
      */
19
     _calendarEnabled: boolean,
20
     _calendarEnabled: boolean,
20
 
21
 
22
+    /**
23
+     * Whether the recent list is enabled
24
+     */
25
+    _recentListEnabled: Boolean,
26
+
21
     /**
27
     /**
22
      * Room name to join to.
28
      * Room name to join to.
23
      */
29
      */
239
 export function _mapStateToProps(state: Object) {
245
 export function _mapStateToProps(state: Object) {
240
     return {
246
     return {
241
         _calendarEnabled: isCalendarEnabled(state),
247
         _calendarEnabled: isCalendarEnabled(state),
248
+        _recentListEnabled: isRecentListEnabled(),
242
         _room: state['features/base/conference'].room,
249
         _room: state['features/base/conference'].room,
243
         _settings: state['features/base/settings']
250
         _settings: state['features/base/settings']
244
     };
251
     };

+ 11
- 5
react/features/welcome/components/WelcomePage.web.js Zobrazit soubor

285
             return null;
285
             return null;
286
         }
286
         }
287
 
287
 
288
-        const { _calendarEnabled, t } = this.props;
288
+        const { _calendarEnabled, _recentListEnabled, t } = this.props;
289
 
289
 
290
         const tabs = [];
290
         const tabs = [];
291
 
291
 
296
             });
296
             });
297
         }
297
         }
298
 
298
 
299
-        tabs.push({
300
-            label: t('welcomepage.recentList'),
301
-            content: <RecentList />
302
-        });
299
+        if (_recentListEnabled) {
300
+            tabs.push({
301
+                label: t('welcomepage.recentList'),
302
+                content: <RecentList />
303
+            });
304
+        }
305
+
306
+        if (tabs.length === 0) {
307
+            return null;
308
+        }
303
 
309
 
304
         return (
310
         return (
305
             <Tabs
311
             <Tabs

Načítá se…
Zrušit
Uložit