Only split out html/md files;Fix page load problem

index.html

@@ -372,30 +372,25 @@
   <script src="//cdnjs.cloudflare.com/ajax/libs/UpUp/1.1.0/upup.min.js"></script>
   <script>
   window.onload = (function (oldLoad) {
-    return function () {
     oldLoad && oldLoad();
     if (UpUp) {
       UpUp.start({
         'cache-version': '2.0.0',
         'content-url': 'offline.html',
         'assets': [
-            'src.8d47de22.js',
+          'src.c95c2dcd.js',
           'main.3381ca43.css',
           'help.ecc721dc.html',
           'privacy.5cbf7ea0.html',
           'terms.bcb4cecc.html',
           'usage.4a51122f.html',
-            'ads.f4e0c99c.js',
-            'favicon.5d013634.png',
           'ipa-table.6c5cf939.html',
-            'papaparse.min.dab93fe4.js',
+          'favicon.5d013634.png',
         ],
         'service-worker-url': 'upup.sw.min.js',
       });
     }
-    }
   })(window.onload);
-    
   </script>
 </body>
 </html>

src/index.js

@@ -20,12 +20,11 @@ function initialize() {
     });
   }
 
-  setupAds().then(() => renderAll());
+  setupAds();
+  renderAll();
 }
 
 window.onload = (function (oldLoad) {
-  return function () {
   oldLoad && oldLoad();
   initialize();
-  }
 })(window.onload);

src/js/account/passwordReset.js

@@ -1,4 +1,3 @@
-import { setupInfoModal } from "../setupListeners";
 import { request } from "./helpers";
 
 export function renderForgotPasswordForm() {
@@ -24,6 +23,15 @@ export function renderForgotPasswordForm() {
   setupInfoModal(modal);
 }
 
+function setupInfoModal(modal) {
+  const closeElements = modal.querySelectorAll('.modal-background, .close-button');
+  Array.from(closeElements).forEach(close => {
+    close.addEventListener('click', () => {
+      modal.parentElement.removeChild(modal);
+    });
+  });
+}
+
 function setupStartResetForm() {
   document.getElementById('forgotPasswordSubmit').addEventListener('click', startPasswordReset);
 }
@@ -59,7 +67,10 @@ function startPasswordReset() {
 }
 
 function setupPasswordResetForm() {
-  document.getElementById('newPasswordSubmit').addEventListener('click', submitPasswordReset);
+  const submitButton = document.getElementById('newPasswordSubmit');
+  if (submitButton) {
+    submitButton.addEventListener('click', submitPasswordReset);
+  }
 }
 
 function submitPasswordReset() {
@@ -97,8 +108,6 @@ function submitPasswordReset() {
 }
 
 window.onload = (function (oldLoad) {
-  return function () {
   oldLoad && oldLoad();
   setupPasswordResetForm();
-  }
 })(window.onload);

src/js/ads.js

@@ -1,12 +1,11 @@
 import { DISPLAY_AD_EVERY } from '../constants.js';
+import ads from '../../ads.json';
 
 export function setupAds() {
-  return import('../../ads.json').then(ads => {
   const shuffle = (a, b) => Math.random() > 0.5 ? 1 : -1;
   const priority = ads.filter(ad => isActive(ad) && ad.isPriority).sort(shuffle);
   const regular = ads.filter(ad => isActive(ad) && !ad.isPriority).sort(shuffle);
   window.ads = [...priority, ...regular];
-  });
 }
 
 function isActive(ad) {

src/js/dictionaryManagement.js

@@ -1,3 +1,4 @@
+import papa from 'papaparse';
 import { renderDictionaryDetails, renderPartsOfSpeech, renderAll, renderTheme } from "./render";
 import { removeTags, cloneObject, getTimestampInSeconds, download, slugify } from "../helpers";
 import { LOCAL_STORAGE_KEY, DEFAULT_DICTIONARY, MIGRATE_VERSION } from "../constants";
@@ -203,7 +204,6 @@ export function importWords() {
   if (importWordsField.files.length === 1) {
     if (confirm('Importing a CSV file with words will add all of the words in the file to your dictionary regardless of duplication!\nDo you want to continue?')) {
       addMessage('Importing words...');
-      import('papaparse').then(papa => {
       const importedWords = [];
       papa.parse(importWordsField.files[0], {
         header: true,
@@ -247,7 +247,6 @@ export function importWords() {
         },
         skipEmptyLines: true,
       });
-      });
     }
   }
 }
@@ -269,7 +268,6 @@ export function exportWords() {
   addMessage('Exporting Words...');
 
   setTimeout(() => {
-    import('papaparse').then(papa => {
     const { name, specification } = window.currentDictionary;
     
     const fileName = slugify(name + '_' + specification) + '_words.csv';
@@ -285,7 +283,6 @@ export function exportWords() {
     });
     const csv = papa.unparse(words, { quotes: true });
     download(csv, fileName, 'text/csv;charset=utf-8');
-    });
   }, 1);
 }
 

src/js/hotkeys.js

@@ -5,6 +5,7 @@ import { showSearchModal, clearSearchText } from "./search";
 import { saveAndCloseSettingsModal, openSettingsModal, saveSettings } from "./settings";
 import { saveAndCloseEditModal, openEditModal } from "./dictionaryManagement";
 import { addMessage, hideAllModals } from "./utilities";
+import helpFile from '../markdown/help.md';
 
 export function enableHotKeys() {
   document.addEventListener('keydown', hotKeyActions);
@@ -102,9 +103,7 @@ function submitWord() {
 }
 
 function showHelpModal() {
-  import('../markdown/help.md').then(html => {
+  renderInfoModal(helpFile);
-    renderInfoModal(html);
-  });
 }
 
 function maximizeTextarea() {

src/js/render.js

@@ -17,6 +17,7 @@ import {
 import { getPaginationData } from './pagination';
 import { getOpenEditForms, parseReferences } from './wordManagement';
 import { renderAd } from './ads';
+import ipaTableFile from './KeyboardFire/phondue/ipa-table.html';
 
 export function renderAll() {
   renderTheme();
@@ -311,7 +312,6 @@ export function renderIPATable(ipaTableButton) {
   ipaTableButton = typeof ipaTableButton.target === 'undefined' || ipaTableButton.target === '' ? ipaTableButton : ipaTableButton.target;
   const label = ipaTableButton.parentElement.innerText.replace(/(Field Help|IPA Chart)/g, '').trim();
   const textBox = ipaTableButton.parentElement.querySelector('input');
-  import('./KeyboardFire/phondue/ipa-table.html').then(html => {
   const modalElement = document.createElement('section');
   modalElement.classList.add('modal', 'ipa-table-modal');
   modalElement.innerHTML = `<div class="modal-background"></div>
@@ -319,7 +319,7 @@ export function renderIPATable(ipaTableButton) {
     <a class="close-button">&times;&#xFE0E;</a>
     <header><label>${label} <input value="${textBox.value}" class="ipa-field"></label></header>
     <section>
-        ${html}
+      ${ipaTableFile}
     </section>
     <footer><a class="button done-button">Done</a></footer>
   </div>`;
@@ -328,7 +328,6 @@ export function renderIPATable(ipaTableButton) {
   
   setupIPAFields();
   setupIPATable(modalElement, textBox);
-  });
 }
 
 export function renderMaximizedTextbox(maximizeButton) {

src/js/setupListeners.js

@@ -8,6 +8,9 @@ import { usePhondueDigraphs } from './KeyboardFire/phondue/ipaField';
 import { openSettingsModal, saveSettingsModal, saveAndCloseSettingsModal } from './settings';
 import { enableHotKeys } from './hotkeys';
 import { showSearchModal, clearSearchText, checkAllPartsOfSpeechFilters, uncheckAllPartsOfSpeechFilters } from './search';
+import helpFile from '../markdown/help.md';
+import termsFile from '../markdown/terms.md';
+import privacyFile from '../markdown/privacy.md';
 
 export default function setupListeners() {
   setupDetailsTabs();
@@ -357,19 +360,13 @@ export function setupMaximizeModal(modal, textBox) {
 
 export function setupInfoButtons() {
   document.getElementById('helpInfoButton').addEventListener('click', () => {
-    import('../markdown/help.md').then(html => {
+    renderInfoModal(helpFile);
-      renderInfoModal(html);
-    });
   });
   document.getElementById('termsInfoButton').addEventListener('click', () => {
-    import('../markdown/terms.md').then(html => {
+    renderInfoModal(termsFile);
-      renderInfoModal(html);
-    });
   });
   document.getElementById('privacyInfoButton').addEventListener('click', () => {
-    import('../markdown/privacy.md').then(html => {
+    renderInfoModal(privacyFile);
-      renderInfoModal(html);
-    });
   });
 }
 

src/js/view/index.js

@@ -3,7 +3,8 @@ import setupListeners from './setupListeners';
 import { setupAds } from '../ads';
 
 function initialize() {
-  setupAds().then(() => renderAll());
+  setupAds();
+  renderAll();
   setupListeners();
 }
 

src/js/view/setupListeners.js

@@ -1,6 +1,9 @@
 import {showSection, hideDetailsPanel} from './displayToggles';
 import { showSearchModal, clearSearchText, checkAllPartsOfSpeechFilters, uncheckAllPartsOfSpeechFilters } from './search';
 import { renderWords, renderInfoModal } from './render';
+import helpFile from '../../markdown/help.md';
+import termsFile from '../../markdown/terms.md';
+import privacyFile from '../../markdown/privacy.md';
 
 export default function setupListeners() {
   setupDetailsTabs();
@@ -79,19 +82,13 @@ export function setupSearchFilters() {
 
 export function setupInfoButtons() {
   document.getElementById('helpInfoButton').addEventListener('click', () => {
-    import('../../markdown/help.md').then(html => {
+    renderInfoModal(helpFile);
-      renderInfoModal(html);
-    });
   });
   document.getElementById('termsInfoButton').addEventListener('click', () => {
-    import('../../markdown/terms.md').then(html => {
+    renderInfoModal(termsFile);
-      renderInfoModal(html);
-    });
   });
   document.getElementById('privacyInfoButton').addEventListener('click', () => {
-    import('../../markdown/privacy.md').then(html => {
+    renderInfoModal(privacyFile);
-      renderInfoModal(html);
-    });
   });
 }