Fixed theme loading. Mitigates Firefox bug.

space10-community · Nov 20, 2019 · d64f4fa · d64f4fa
1 parent a79324c
commit d64f4fa
Show file tree

Hide file tree

Showing 3 changed files with 1,332 additions and 1,265 deletions.
diff --git a/landingpage/src/main.js b/landingpage/src/main.js
@@ -24,36 +24,14 @@ function preloadFormImages() {
   images.map(el => (new Image()).src = el.getAttribute('cf-image'));
 }
 
-function loadThemes() {
-  console.log('loadThemes');
-
-  loadcss(themes.map(t => `./${t}`), (links) => {
-    links.forEach(link => console.log(link));
-
-    const stylesheets = [].slice.call(document.styleSheets);
-    stylesheets.map((s, i) => {
-      console.log(i, s.href);
-      const filename = s.href.substring(s.href.lastIndexOf('/') + 1);
-      if (
-        filename.indexOf('conversational-form') > -1
-        && filename.indexOf(themes[0]) === -1
-        && filename.indexOf('main.') === -1
-      ) {
-        document.styleSheets[i].disabled = true;
-      }
-      return s;
-    });
-  });
-}
-
 function changeTheme(themeName) {
   if (currentTheme === themeName) return;
 
   console.log('changeTheme', currentTheme, themeName);
   const stylesheets = [].slice.call(document.styleSheets);
   stylesheets.map((s, i) => {
     const filename = s.href.substring(s.href.lastIndexOf('/') + 1);
-    console.log('t', filename);
+    // console.log('t', filename);
     if (
       document.styleSheets[i].disabled === false
       && filename.indexOf('conversational-form') > -1
@@ -70,6 +48,32 @@ function changeTheme(themeName) {
   });
 }
 
+function loadThemes() {
+  console.log('loadThemes');
+
+  const totalThemes = themes.length;
+
+  loadcss(themes.map(t => `./${t}`), () => {
+    const stylesheets = [].slice.call(document.styleSheets);
+    stylesheets.map((s, i) => {
+      // console.log(i, s.href);
+      const filename = s.href.substring(s.href.lastIndexOf('/') + 1);
+      if (
+        filename.indexOf('conversational-form') > -1
+        && filename.indexOf(themes[0]) === -1
+        && filename.indexOf('main.') === -1
+      ) {
+        document.styleSheets[i].disabled = true;
+      }
+
+      console.log('loaded', i);
+      if (totalThemes === i) changeTheme(themes[0]);
+
+      return s;
+    });
+  });
+}
+
 function animateIn() {
   const headerEl = document.querySelector('header');
   const headlineEl = document.querySelector('h1');
@@ -143,8 +147,6 @@ function animateIn() {
 
 function init() {
   loadThemes();
-  changeTheme(themes[1]);
-  preloadFormImages();
   Tracking.registerAllExternalLinks();
 
   const wrapperEl = document.querySelector('.wrapper');