mirror of
https://github.com/element-hq/element-web
synced 2024-11-28 20:38:55 +03:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
299a32fa98
1 changed files with 3 additions and 4 deletions
|
@ -921,7 +921,7 @@ module.exports = React.createClass({
|
|||
|
||||
styleElements[theme].disabled = false;
|
||||
|
||||
let switchTheme = function() {
|
||||
const switchTheme = function() {
|
||||
const colors = Tinter.getCurrentColors();
|
||||
Object.values(styleElements).forEach((a) => {
|
||||
if (a == styleElements[theme]) return;
|
||||
|
@ -933,9 +933,8 @@ module.exports = React.createClass({
|
|||
|
||||
if (styleElements[theme].complete) {
|
||||
switchTheme();
|
||||
}
|
||||
else {
|
||||
styleElements[theme].onload = () => {
|
||||
} else {
|
||||
styleElements[theme].onload = () => {
|
||||
switchTheme();
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue