assets/js/src/main.js in landing-page-gem-0.3.8 vs assets/js/src/main.js in landing-page-gem-0.3.9

@@ -1,26 +1,30 @@
 import '../../scss/main.scss';
 // import test from './test';
 
 function loadModule(module) {
-  import(`./${module}`).then(({default: module}) => {
-    module();
-  });
+  return import(`./${module}`).then(({default: module}) => module())
 }
 
-document.addEventListener('DOMContentLoaded', () => {
+window.addEventListener('load', () => {
 
   Promise.resolve()
     .then(() => {
-      if ( window.location.hostname.search(/\.kcc\.edu/) !== -1 ) {
-        loadModule('loadClarusCorpScript');
-    }})
+      if (window.location.hostname.search(/\.kcc\.edu/) == -1)
+        return;
+      
+      return loadModule('loadClarusCorpScript');
+    }).then(() => {
+      if (!document.querySelector('img[data-src]'))
+        return;
+      
+      return loadModule('lazyLoad');
+    }).then(() => loadModule('footerDate'))
     .then(() => {
-    if ( document.querySelector('img[data-src]') ) {
-      loadModule('lazyLoad');
-    }})
-    .then(() => loadModule('footerDate'))
-    .then(() => {
-      if ( document.querySelector('a[href="#page-top"]') ) {
-        loadModule('landingPage');
-    }})
+      if (!document.querySelector('a[href="#page-top"]'))
+        return;
+      
+      return loadModule('landingPage');
+    }).catch(err => {
+      console.error(`Error loading landing-page JS modules: ${err.message}`, err);
+    })
 });
\ No newline at end of file