Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #307 from vector-im/hs/deault-hs-url

Browse source 
Allow specifying a custom defaultHomeServer
This commit is contained in:
Bruno Windels 2021-04-01 13:03:46 +00:00 committed by GitHub
commit 1505f2d101
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
assets/config.json
View file

@ -3,5 +3,6 @@
"appId": "io.element.hydrogen.web", "appId": "io.element.hydrogen.web",
"gatewayUrl": "https://matrix.org", "gatewayUrl": "https://matrix.org",
"applicationServerKey": "BC-gpSdVHEXhvHSHS0AzzWrQoukv2BE7KzpoPO_FfPacqOo3l1pdqz7rSgmB04pZCWaHPz7XRe6fjLaC-WPDopM" "applicationServerKey": "BC-gpSdVHEXhvHSHS0AzzWrQoukv2BE7KzpoPO_FfPacqOo3l1pdqz7rSgmB04pZCWaHPz7XRe6fjLaC-WPDopM"
} },
"defaultHomeServer": "matrix.org"
} }

1
index.html
View file

@ -24,6 +24,7 @@
main(new Platform(document.body, { main(new Platform(document.body, {
worker: "src/worker.js", worker: "src/worker.js",
downloadSandbox: "assets/download-sandbox.html", downloadSandbox: "assets/download-sandbox.html",
defaultHomeServer: "matrix.org",
// NOTE: uncomment this if you want the service worker for local development // NOTE: uncomment this if you want the service worker for local development
// serviceWorker: "sw.js", // serviceWorker: "sw.js",
// NOTE: provide push config if you want push notifs for local development // NOTE: provide push config if you want push notifs for local development

2
src/domain/RootViewModel.js
View file

@ -99,7 +99,7 @@ export class RootViewModel extends ViewModel {
_showLogin() { _showLogin() {
this._setSection(() => { this._setSection(() => {
this._loginViewModel = new LoginViewModel(this.childOptions({ this._loginViewModel = new LoginViewModel(this.childOptions({
defaultHomeServer: "https://matrix.org", defaultHomeServer: this.platform.config["defaultHomeServer"],
createSessionContainer: this._createSessionContainer, createSessionContainer: this._createSessionContainer,
ready: sessionContainer => { ready: sessionContainer => {
// we don't want to load the session container again, // we don't want to load the session container again,

4
src/platform/web/Platform.js
View file

@ -125,6 +125,10 @@ export class Platform {
return loadOlm(this._config.olm); return loadOlm(this._config.olm);
} }
get config() {
return this._config;
}
async loadOlmWorker() { async loadOlmWorker() {
if (!window.WebAssembly) { if (!window.WebAssembly) {
return await loadOlmWorker(this._config); return await loadOlmWorker(this._config);