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

remove setter

pull/21833/head
David Baker 2020-01-31 13:18:01 +00:00
parent 2d9b111680
commit cb9362456f
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,7 +507,7 @@ export default createReactClass({
view: VIEWS.LOGIN,
});
this.notifyNewScreen('login');
ThemeController.setIsLogin(true);
ThemeController.isLogin = true;
this._themeWatcher.recheck();
break;
case 'start_post_registration':
@ -763,7 +763,7 @@ export default createReactClass({
}
this.setStateForNewView(newState);
ThemeController.setIsLogin(true);
ThemeController.isLogin = true;
this._themeWatcher.recheck();
this.notifyNewScreen('register');
},
@ -915,7 +915,7 @@ export default createReactClass({
view: VIEWS.WELCOME,
});
this.notifyNewScreen('welcome');
ThemeController.setIsLogin(true);
ThemeController.isLogin = true;
this._themeWatcher.recheck();
},
@ -926,7 +926,7 @@ export default createReactClass({
});
this._setPage(PageTypes.HomePage);
this.notifyNewScreen('home');
ThemeController.setIsLogin(false);
ThemeController.isLogin = false;
this._themeWatcher.recheck();
},
@ -1240,7 +1240,7 @@ export default createReactClass({
});
this.subTitleStatus = '';
this._setPageSubtitle();
ThemeController.setIsLogin(true);
ThemeController.isLogin = true;
this._themeWatcher.recheck();
},

4
src/settings/controllers/ThemeController.js
View File

@ -21,10 +21,6 @@ import {DEFAULT_THEME, enumerateThemes} from "../../theme";
export default class ThemeController extends SettingController {
static isLogin = false;
static setIsLogin(val) {
ThemeController.isLogin = val;
}
getValueOverride(level, roomId, calculatedValue, calculatedAtLevel) {
if (!calculatedValue) return null; // Don't override null themes