mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-11-04 02:02:14 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Weblate 2017-11-14 16:04:19 +00:00
commit 869a2d158f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Tinter.js
View File

@ -217,7 +217,7 @@ class Tinter {
// cache our fixups // cache our fixups
if (this.cssFixups[this.theme]) return; if (this.cssFixups[this.theme]) return;
if (DEBUG) console.trace("calcCssFixups start for " + this.theme + " (checking " + if (DEBUG) console.debug("calcCssFixups start for " + this.theme + " (checking " +
document.styleSheets.length + document.styleSheets.length +
" stylesheets)"); " stylesheets)");

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

@ -931,7 +931,17 @@ module.exports = React.createClass({
Tinter.tint(colors[0], colors[1]); Tinter.tint(colors[0], colors[1]);
}; };
if (styleElements[theme].complete) { let cssLoaded = false;
for (let i = 0; i < document.styleSheets.length; i++) {
const ss = document.styleSheets[i];
if (ss && ss.href === styleElements[theme].href) {
cssLoaded = true;
break;
}
}
if (cssLoaded) {
switchTheme(); switchTheme();
} else { } else {
styleElements[theme].onload = () => { styleElements[theme].onload = () => {