diff --git a/app.js b/app.js index e39ce7637..b30a527d7 100644 --- a/app.js +++ b/app.js @@ -24,7 +24,9 @@ const LogCollector = Logger.LogCollector; import JitsiMeetLogStorage from "./modules/util/JitsiMeetLogStorage"; import URLProcessor from "./modules/config/URLProcessor"; -import { generateRoomWithoutSeparator } from './modules/util/RoomnameGenerator'; +import { + generateRoomWithoutSeparator +} from './react/features/base/util/roomnameGenerator'; import UI from "./modules/UI/UI"; import settings from "./modules/settings/Settings"; diff --git a/modules/UI/UI.js b/modules/UI/UI.js index db8845edc..10a502cc2 100644 --- a/modules/UI/UI.js +++ b/modules/UI/UI.js @@ -25,7 +25,7 @@ import SettingsMenu from "./side_pannels/settings/SettingsMenu"; import Profile from "./side_pannels/profile/Profile"; import Settings from "./../settings/Settings"; import RingOverlay from "./ring_overlay/RingOverlay"; -import { randomInt } from "../util/RandomUtil"; +import { randomInt } from "../../react/features/base/util/randomUtil"; import UIErrors from './UIErrors'; import { debounce } from "../util/helpers"; diff --git a/modules/UI/welcome_page/WelcomePage.js b/modules/UI/welcome_page/WelcomePage.js index 0826e943f..775f2a37c 100644 --- a/modules/UI/welcome_page/WelcomePage.js +++ b/modules/UI/welcome_page/WelcomePage.js @@ -1,6 +1,8 @@ /* global $, interfaceConfig, APP */ -import { generateRoomWithoutSeparator } from '../../util/RoomnameGenerator'; +import { + generateRoomWithoutSeparator +} from '../../../react/features/base/util/roomnameGenerator'; import UIUtil from '../util/UIUtil'; var animateTimeout, updateTimeout; diff --git a/react/features/base/util/index.js b/react/features/base/util/index.js index 5c0023117..bba594a46 100644 --- a/react/features/base/util/index.js +++ b/react/features/base/util/index.js @@ -1 +1,2 @@ export * from './loadScript'; +export * from './roomnameGenerator'; diff --git a/modules/util/RandomUtil.js b/react/features/base/util/randomUtil.js similarity index 100% rename from modules/util/RandomUtil.js rename to react/features/base/util/randomUtil.js diff --git a/modules/util/RoomnameGenerator.js b/react/features/base/util/roomnameGenerator.js similarity index 99% rename from modules/util/RoomnameGenerator.js rename to react/features/base/util/roomnameGenerator.js index 52a5c0634..63adfaad7 100644 --- a/modules/util/RoomnameGenerator.js +++ b/react/features/base/util/roomnameGenerator.js @@ -1,4 +1,4 @@ -import { randomElement } from './RandomUtil'; +import { randomElement } from './randomUtil'; /* const _NOUN_ = [