matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-20 16:22:28 +03:00
Code Activity

Merge branch 'develop' into luke/linting-keyword-spacing

Browse Source
This commit is contained in:
Luke Barnard
2017-11-16 13:23:42 +00:00
parent dad797d4a2 30b8d0e807
commit b54e563cb6
11 changed files with 84 additions and 20 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) {
if (!theme) {
theme = this.props.config.default_theme || 'light';
theme = SettingsStore.getValueAt(SettingLevel.DEFAULT, "theme");
}
// look for the stylesheet elements.

3
src/components/structures/UserSettings.js
View File

@@ -613,8 +613,7 @@ module.exports = React.createClass({
onLanguageChange: function(newLang) {
if (this.state.language !== newLang) {
// We intentionally promote this to the account level at this point
SettingsStore.setValue("language", null, SettingLevel.ACCOUNT, newLang);
SettingsStore.setValue("language", null, SettingLevel.DEVICE, newLang);
this.setState({
language: newLang,
});