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 16:07:56 +00:00
parent 869a2d158f 7c98558b6a
commit 4c4220e9dd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -931,8 +931,15 @@ module.exports = React.createClass({
Tinter.tint(colors[0], colors[1]); Tinter.tint(colors[0], colors[1]);
}; };
// turns out that Firefox preloads the CSS for link elements with
// the disabled attribute, but Chrome doesn't.
let cssLoaded = false; let cssLoaded = false;
styleElements[theme].onload = () => {
switchTheme();
};
for (let i = 0; i < document.styleSheets.length; i++) { for (let i = 0; i < document.styleSheets.length; i++) {
const ss = document.styleSheets[i]; const ss = document.styleSheets[i];
if (ss && ss.href === styleElements[theme].href) { if (ss && ss.href === styleElements[theme].href) {
@ -942,11 +949,8 @@ module.exports = React.createClass({
} }
if (cssLoaded) { if (cssLoaded) {
styleElements[theme].onload = undefined;
switchTheme(); switchTheme();
} else {
styleElements[theme].onload = () => {
switchTheme();
};
} }
if (theme === 'dark') { if (theme === 'dark') {