mirror of
https://github.com/vector-im/element-web.git
synced 2025-08-28 09:52:16 +02:00
Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
299a32fa98
@ -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…
x
Reference in New Issue
Block a user