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

Merge remote-tracking branch 'origin/develop' into develop

pull/21833/head
Weblate 2017-11-14 15:37:12 +00:00
parent 54b430c465 8d6e3dd27d
commit 299a32fa98
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -921,7 +921,7 @@ module.exports = React.createClass({
styleElements[theme].disabled = false; styleElements[theme].disabled = false;
let switchTheme = function() { const switchTheme = function() {
const colors = Tinter.getCurrentColors(); const colors = Tinter.getCurrentColors();
Object.values(styleElements).forEach((a) => { Object.values(styleElements).forEach((a) => {
if (a == styleElements[theme]) return; if (a == styleElements[theme]) return;
@ -933,9 +933,8 @@ module.exports = React.createClass({
if (styleElements[theme].complete) { if (styleElements[theme].complete) {
switchTheme(); switchTheme();
} } else {
else { styleElements[theme].onload = () => {
styleElements[theme].onload = () => {
switchTheme(); switchTheme();
}; };
} }