Merge pull request element-hq#12842 from vector-im/revert-12836-travis/jitsi-wrapper

turt2live · web-flow · commit 4de93a8cddd3 · 2020-03-24T09:15:34.000-06:00
Revert "Remove useless app preloading from Jitsi widget wrapper"
diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts
@@ -20,6 +20,7 @@ require("./index.scss");
 import * as qs from 'querystring';
 import { Capability, WidgetApi } from "matrix-react-sdk/src/widgets/WidgetApi";
 import SdkConfig from "matrix-react-sdk/src/SdkConfig";
+import { loadConfig, preparePlatform } from "../initial-load";
 
 // Dev note: we use raw JS without many dependencies to reduce bundle size.
 // We do not need all of React to render a Jitsi conference.
@@ -60,8 +61,12 @@ let widgetApi: WidgetApi;
             await widgetApi.setAlwaysOnScreen(false);
         });
 
+        // Bootstrap ourselves for loading the script and such
+        preparePlatform();
+        await loadConfig();
+
         // Populate the Jitsi params now
-        jitsiDomain = qsParam('conferenceDomain', false);
+        jitsiDomain = qsParam('conferenceDomain', true) || SdkConfig.get()['jitsi']['preferredDomain'];
         conferenceId = qsParam('conferenceId');
         displayName = qsParam('displayName', true);
         avatarUrl = qsParam('avatarUrl', true); // http not mxc
