From 58de839621b63b7dd3137abe822bfd893e135b88 Mon Sep 17 00:00:00 2001 From: Marcel Date: Thu, 31 May 2018 22:32:29 +0200 Subject: [PATCH] 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. --- src/vector/index.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/vector/index.js b/src/vector/index.js index 14e181d911..0aab906081 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -313,9 +313,13 @@ async function loadApp() { // FIXME: we should probably block loading the app or even // showing a spinner until the theme is loaded, to avoid // flashes of unstyled content. - a.onload = () => { + if (typeof InstallTrigger !== 'undefined') { Tinter.setTheme(theme); - }; + } else { + a.onload = () => { + Tinter.setTheme(theme); + }; + } } else { // Firefox requires this to not be done via `setAttribute` // or via HTML.