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

Merge pull request #7288 from vector-im/bwindels/fixmobileguideloadedonriot 

Fix config not loading & mobileguide script being loaded in riot
pull/7093/merge
David Baker 2018-09-05 15:48:04 +01:00 committed by GitHub
parent 52bbd8c764 d10fda36af
commit 736450e184
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vector/index.js
View File

@ -240,7 +240,7 @@ async function loadApp() {
let configJson; let configJson;
let configError; let configError;
try { try {
configJson = getVectorConfig(); configJson = await getVectorConfig();
} catch (e) { } catch (e) {
configError = e; configError = e;
} }

1
webpack.config.js
View File

@ -130,6 +130,7 @@ module.exports = {
// bottom of <head> or the bottom of <body>, and I'm a bit scared // bottom of <head> or the bottom of <body>, and I'm a bit scared
// about moving them. // about moving them.
inject: false, inject: false,
excludeChunks: ['mobileguide'],
vars: { vars: {
og_image_url: og_image_url, og_image_url: og_image_url,
}, },