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

Merge pull request #4105 from matrix-org/t3chguy/fix_theme 

Fix theme being overridden to light even after login is completed
pull/21833/head
Michael Telatynski 2020-02-21 15:37:44 +00:00 committed by GitHub
parent 953af6f036 4ed4d91b48
commit 476c622a61
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

1
src/components/structures/MatrixChat.js
View File

@ -1175,6 +1175,7 @@ export default createReactClass({
* Called when a new logged in session has started * Called when a new logged in session has started
*/ */
_onLoggedIn: async function() { _onLoggedIn: async function() {
ThemeController.isLogin = false;
this.setStateForNewView({ view: VIEWS.LOGGED_IN }); this.setStateForNewView({ view: VIEWS.LOGGED_IN });
if (MatrixClientPeg.currentUserIsJustRegistered()) { if (MatrixClientPeg.currentUserIsJustRegistered()) {
MatrixClientPeg.setJustRegisteredUserId(null); MatrixClientPeg.setJustRegisteredUserId(null);

2
src/theme.js
View File

@ -70,7 +70,7 @@ export class ThemeWatcher {
} }
}; };
// XXX: forceTheme param aded here as local echo appears to be unreliable // XXX: forceTheme param added here as local echo appears to be unreliable
// https://github.com/vector-im/riot-web/issues/11443 // https://github.com/vector-im/riot-web/issues/11443
recheck(forceTheme) { recheck(forceTheme) {
const oldTheme = this._currentTheme; const oldTheme = this._currentTheme;