From 5b32ecb719b9223eb6d2459b75443c5ce10488d9 Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 24 Jul 2018 13:38:49 +0200 Subject: [PATCH] [Tinter.setTheme fix] add missing comment and move old to correct position --- src/vector/index.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/vector/index.js b/src/vector/index.js index 0aab906081..67c69eb7d0 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -310,12 +310,19 @@ async function loadApp() { // in case the Tinter.tint() in MatrixChat fires before the // CSS has actually loaded (which in practice happens)... - // FIXME: we should probably block loading the app or even - // showing a spinner until the theme is loaded, to avoid - // flashes of unstyled content. + // This if fixes Tinter.setTheme to not fire on Firefox + // in case it is the first time loading Riot. + // `InstallTrigger` is a Object which only exists on Firefox + // (it is used for their Plugins) and can be used as a + // feature check. + // Firefox loads css always before js. This is why we dont use + // onload or it's EventListener as thoose will never trigger. if (typeof InstallTrigger !== 'undefined') { Tinter.setTheme(theme); } else { + // 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 = () => { Tinter.setTheme(theme); };