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

Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/react16

Browse source
This commit is contained in:
Michael Telatynski 2019-08-24 11:42:03 +01:00
commit 7eefc9d856
11 changed files with 187 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/vector/index.js
View file

@ -192,11 +192,6 @@ async function loadApp() {
await loadOlm();
await loadLanguage();
const fragparts = parseQsFromFragment(window.location);
const params = parseQs(window.location);
// set the platform for react sdk
if (window.ipcRenderer) {
console.log("Using Electron platform");
@ -236,6 +231,12 @@ async function loadApp() {
// granular settings are loaded correctly and to avoid duplicating the override logic for the theme.
SdkConfig.put(configJson);
// Load language after loading config.json so that settingsDefaults.language can be applied
await loadLanguage();
const fragparts = parseQsFromFragment(window.location);
const params = parseQs(window.location);
// don't try to redirect to the native apps if we're
// verifying a 3pid (but after we've loaded the config)
// or if the user is following a deep link