mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Make sure we load the config before trying to redirect to a mobile page

Browse source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-11-16 21:00:30 -07:00
parent 67ca1515d8
commit eb40de4670
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/vector/index.js
View file

@ -246,8 +246,27 @@ async function loadApp() {
// set the platform for react sdk (our Platform object automatically picks the right one) // set the platform for react sdk (our Platform object automatically picks the right one)
PlatformPeg.set(new Platform()); PlatformPeg.set(new Platform());
// Load the config file. First try to load up a domain-specific config of the
// form "config.$domain.json" and if that fails, fall back to config.json.
let configJson;
let configError;
try {
try {
configJson = await getConfig(`config.${document.domain}.json`);
// 404s succeed with an empty json config, so check that there are keys
if (Object.keys(configJson).length === 0) {
throw new Error(); // throw to enter the catch
}
} catch (e) {
configJson = await getConfig("config.json");
}
} catch (e) {
configError = e;
}
SdkConfig.put(configJson);
// don't try to redirect to the native apps if we're // don't try to redirect to the native apps if we're
// verifying a 3pid // verifying a 3pid (but after we've loaded the config)
const preventRedirect = Boolean(fragparts.params.client_secret); const preventRedirect = Boolean(fragparts.params.client_secret);
if (!preventRedirect) { if (!preventRedirect) {
@ -279,25 +298,6 @@ async function loadApp() {
} }
} }
// Load the config file. First try to load up a domain-specific config of the
// form "config.$domain.json" and if that fails, fall back to config.json.
let configJson;
let configError;
try {
try {
configJson = await getConfig(`config.${document.domain}.json`);
// 404s succeed with an empty json config, so check that there are keys
if (Object.keys(configJson).length === 0) {
throw new Error(); // throw to enter the catch
}
} catch (e) {
configJson = await getConfig("config.json");
}
} catch (e) {
configError = e;
}
SdkConfig.put(configJson);
// as quickly as we possibly can, set a default theme... // as quickly as we possibly can, set a default theme...
const styleElements = Object.create(null); const styleElements = Object.create(null);
let a; let a;