OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Code style fixes 

Use async/await consistently rather than flipping between that and
callbacks, s/var/let/, indenting
pull/4035/head
David Baker 2017-05-23 16:44:54 +01:00
parent a6b11968a4
commit 241d95293e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vector/index.js
View File

@ -247,6 +247,7 @@ function onLoadCompleted() {
} }
async function loadApp() { async function loadApp() {
await loadLanguage();
const fragparts = parseQsFromFragment(window.location); const fragparts = parseQsFromFragment(window.location);
const params = parseQs(window.location); const params = parseQs(window.location);
@ -338,17 +339,16 @@ async function loadApp() {
} }
} }
function loadLanguage(callback) { async function loadLanguage() {
const _localSettings = getLocalSettings(); const _localSettings = getLocalSettings();
var languages = []; let languages = [];
if (!_localSettings.hasOwnProperty('language')) { if (!_localSettings.hasOwnProperty('language')) {
languages = languageHandler.getNormalizedLanguageKeys(languageHandler.getLanguageFromBrowser()); languages = languageHandler.getNormalizedLanguageKeys(languageHandler.getLanguageFromBrowser());
}else { } else {
languages = languageHandler.getNormalizedLanguageKeys(_localSettings.language); languages = languageHandler.getNormalizedLanguageKeys(_localSettings.language);
} }
languageHandler.setLanguage(languages, counterpart); languageHandler.setLanguage(languages, counterpart);
setLocalSetting('language', languages[0]); setLocalSetting('language', languages[0]);
callback();
} }
loadLanguage(loadApp); loadApp();