gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Tinter.setTheme to not fire using Firefox 

This if checks if we got a Firefox using a variable that is undefined everywhere except in Firefox. In Firefox because of how it renders the DOM ensure that css is always loaded before it loads/runs the js code. Therefor onload 1. never triggers and 2. we can just call setTheme.
This commit is contained in:
Marcel 2018-05-31 22:32:29 +02:00 committed by GitHub
parent a4b58f4d83
commit 58de839621
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vector/index.js
View File

@ -313,9 +313,13 @@ async function loadApp() {
// FIXME: we should probably block loading the app or even // FIXME: we should probably block loading the app or even
// showing a spinner until the theme is loaded, to avoid // showing a spinner until the theme is loaded, to avoid
// flashes of unstyled content. // flashes of unstyled content.
a.onload = () => { if (typeof InstallTrigger !== 'undefined') {
Tinter.setTheme(theme); Tinter.setTheme(theme);
}; } else {
a.onload = () => {
Tinter.setTheme(theme);
};
}
} else { } else {
// Firefox requires this to not be done via `setAttribute` // Firefox requires this to not be done via `setAttribute`
// or via HTML. // or via HTML.