imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use SettingsStore for default theme

Browse source 
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-11-15 19:04:49 -07:00
parent 5104ebfd29
commit 022e40a127
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/MatrixChat.js
View file

@ -891,7 +891,7 @@ module.exports = React.createClass({
*/ */
_onSetTheme: function(theme) { _onSetTheme: function(theme) {
if (!theme) { if (!theme) {
theme = this.props.config.default_theme || 'light'; theme = SettingsStore.getValueAt(SettingLevel.DEFAULT, "theme");
} }
// look for the stylesheet elements. // look for the stylesheet elements.

4
src/settings/SettingsStore.js
View file

@ -181,8 +181,8 @@ export default class SettingsStore {
/** /**
* Gets a setting's value at a particular level, ignoring all levels that are more specific. * Gets a setting's value at a particular level, ignoring all levels that are more specific.
* @param {"device"|"room-device"|"room-account"|"account"|"room"} level The level to * @param {"device"|"room-device"|"room-account"|"account"|"room"|"config"|"default"} level The
* look at. * level to look at.
* @param {string} settingName The name of the setting to read. * @param {string} settingName The name of the setting to read.
* @param {String} roomId The room ID to read the setting value in, may be null. * @param {String} roomId The room ID to read the setting value in, may be null.
* @param {boolean} explicit If true, this method will not consider other levels, just the one * @param {boolean} explicit If true, this method will not consider other levels, just the one