Browse Source

Move roomnameGenerator.js out of features/base/util

Over time features/base/util became a bucket where people seemed to dump
just about anything they couldn't think of a better place for. That's a
trend I don't like encouraging. Given that roomnameGenerator.js is
currently used in features/welcome only, I'm fine with moving it there
for the greater good.
efficient_tiling
Lyubo Marinov 8 years ago
parent
commit
3db557e2c9

+ 0
- 1
react/features/base/util/index.js View File

1
 export * from './loadScript';
1
 export * from './loadScript';
2
 export * from './randomUtil';
2
 export * from './randomUtil';
3
-export * from './roomnameGenerator';

+ 2
- 1
react/features/welcome/components/AbstractWelcomePage.js View File

4
 import { isRoomValid } from '../../base/conference';
4
 import { isRoomValid } from '../../base/conference';
5
 import { VideoTrack } from '../../base/media';
5
 import { VideoTrack } from '../../base/media';
6
 import { getLocalVideoTrack } from '../../base/tracks';
6
 import { getLocalVideoTrack } from '../../base/tracks';
7
-import { generateRoomWithoutSeparator } from '../../base/util';
7
+
8
+import { generateRoomWithoutSeparator } from '../roomnameGenerator';
8
 
9
 
9
 /**
10
 /**
10
  * Base (abstract) class for container component rendering the welcome page.
11
  * Base (abstract) class for container component rendering the welcome page.

react/features/base/util/roomnameGenerator.js → react/features/welcome/roomnameGenerator.js View File

1
 /* @flow */
1
 /* @flow */
2
 
2
 
3
-import { randomElement } from './randomUtil';
3
+import { randomElement } from '../base/util';
4
 
4
 
5
 /*
5
 /*
6
 const _NOUN_ = [
6
 const _NOUN_ = [

+ 1
- 1
react/features/welcome/route.js View File

1
 /* global APP */
1
 /* global APP */
2
 
2
 
3
 import { RouteRegistry } from '../base/react';
3
 import { RouteRegistry } from '../base/react';
4
-import { generateRoomWithoutSeparator } from '../base/util';
5
 
4
 
6
 import { WelcomePage } from './components';
5
 import { WelcomePage } from './components';
6
+import { generateRoomWithoutSeparator } from './roomnameGenerator';
7
 
7
 
8
 /**
8
 /**
9
  * Register route for WelcomePage.
9
  * Register route for WelcomePage.

Loading…
Cancel
Save