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

Merge pull request #3979 from matrix-org/dbkr/no_peeking 

Don't peek until the matrix client is ready
pull/21833/head
David Baker 2020-01-29 15:17:33 +00:00 committed by GitHub
parent a687e4a220 b96ad4a4f0
commit b804a1cedb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/stores/RoomViewStore.js
View File

@ -46,6 +46,7 @@ const INITIAL_STATE = {
forwardingEvent: null, forwardingEvent: null,
quotingEvent: null, quotingEvent: null,
matrixClientIsReady: false,
}; };
/** /**
@ -59,6 +60,9 @@ class RoomViewStore extends Store {
// Initialise state // Initialise state
this._state = INITIAL_STATE; this._state = INITIAL_STATE;
if (MatrixClientPeg.get()) {
this._state.matrixClientIsReady = MatrixClientPeg.get().isInitialSyncComplete();
}
} }
_setState(newState) { _setState(newState) {
@ -136,6 +140,11 @@ class RoomViewStore extends Store {
}, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true); }, /*className=*/null, /*isPriority=*/false, /*isStatic=*/true);
break; break;
} }
case 'sync_state':
this._setState({
matrixClientIsReady: MatrixClientPeg.get().isInitialSyncComplete(),
});
break;
} }
} }
@ -350,7 +359,7 @@ class RoomViewStore extends Store {
} }
shouldPeek() { shouldPeek() {
return this._state.shouldPeek; return this._state.shouldPeek && this._state.matrixClientIsReady;
} }
} }