PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/develop' into dbkr/deactivate_account

Browse source
This commit is contained in:
David Baker 2016-08-03 17:52:35 +01:00
commit afa46a855b
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Lifecycle.js
View file

@ -22,11 +22,7 @@ import dis from './dispatcher';
/**
* Transitions to a logged-in state using the given credentials
* @param {string} credentials.homeserverUrl The base HS URL
* @param {string} credentials.identityServerUrl The base IS URL
* @param {string} credentials.userId The full Matrix User ID
* @param {string} credentials.accessToken The session access token
* @param {boolean} credentials.guest True if the session is a guest session
* @param {MatrixClientCreds} credentials The credentials to use
*/
function setLoggedIn(credentials) {
credentials.guest = Boolean(credentials.guest);
@ -80,11 +76,7 @@ function startMatrixClient() {
UserActivity.start();
Presence.start();
// the react sdk doesn't work without this, so don't allow
// it to be overridden (and modify the global object so at
// at least the app can see we've changed it)
MatrixClientPeg.opts.pendingEventOrdering = "detached";
MatrixClientPeg.get().startClient(MatrixClientPeg.opts);
MatrixClientPeg.start();
}
function onLoggedOut() {