Merge pull request #7 from evansosenko/js-updates

JS updates
evansosenko · Dec 26, 2023 · 85d6ae0 · 85d6ae0
2 parents 08ff47e + e5730af
commit 85d6ae0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -2,6 +2,5 @@
   "semi": false,
   "singleQuote": true,
   "jsxSingleQuote": true,
-  "trailingComma": "none",
   "endOfLine": "lf"
 }
diff --git a/themes/default/assets/js/gamer.js b/themes/default/assets/js/gamer.js
@@ -1,5 +1,5 @@
-globalThis?.addEventListener('DOMContentLoaded', () => {
-  const document = globalThis?.document
+globalThis.addEventListener('DOMContentLoaded', () => {
+  const document = globalThis.document
   if (document == null) return
   initHandlers(document)
 })
@@ -17,7 +17,7 @@ const initHandler = (element) => {
   if (textEl == null || iconEl == null) return
 
   let n = games.findIndex(
-    ({ icon }) => iconEl.getAttribute('data-icon') === icon
+    ({ icon }) => iconEl.getAttribute('data-icon') === icon,
   )
   preloadSounds(n)
 
@@ -48,95 +48,96 @@ const initSound = (n) => {
 }
 
 const createSound = (src) => {
-  const fetch = globalThis?.fetch
+  const fetch = globalThis.fetch
   const preloaded = fetch(src)
     .then((res) => res.arrayBuffer())
     .catch(console.error)
 
   return {
-    play: () => preloaded.then(playAudioBuffer).catch(console.error)
+    play: () => preloaded.then(playAudioBuffer).catch(console.error),
   }
 }
 
 let audioContext
 const playAudioBuffer = async (arrayBuffer) => {
-  const AudioContext = globalThis?.AudioContext
-  const context = audioContext ?? new AudioContext()
-  const source = context.createBufferSource()
-  source.buffer = await context.decodeAudioData(arrayBuffer.slice(0))
-  source.connect(context.destination)
+  const AudioContext = globalThis.AudioContext
+  if (AudioContext == null) return
+  audioContext ??= new AudioContext()
+  const source = audioContext.createBufferSource()
+  source.buffer = await audioContext.decodeAudioData(arrayBuffer.slice(0))
+  source.connect(audioContext.destination)
   source.start()
 }
 
 const games = [
   {
     icon: 'alien-8bit-solid',
     sound:
-      '{{ (resources.Get "audio/shoot.wav" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/shoot.wav" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'block-question-solid',
     sound:
-      '{{ (resources.Get "audio/coin.wav" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/coin.wav" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'mushroom-duotone',
     sound:
-      '{{ (resources.Get "audio/1up.wav" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/1up.wav" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'dungeon-duotone',
     sound:
-      '{{ (resources.Get "audio/secret.wav" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/secret.wav" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'treasure-chest-solid',
     sound:
-      '{{ (resources.Get "audio/item.wav" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/item.wav" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'skull-duotone',
     sound:
-      '{{ (resources.Get "audio/eekum-bokum.mp3" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/eekum-bokum.mp3" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'music-regular',
     sound:
-      '{{ (resources.Get "audio/note.ogg" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/note.ogg" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'puzzle-piece-duotone',
     sound:
-      '{{ (resources.Get "audio/jiggy.ogg" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/jiggy.ogg" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'starfighter-twin-ion-engine-solid',
     sound:
-      '{{ (resources.Get "audio/tie-fighter.wav" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/tie-fighter.wav" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'starfighter-solid',
     sound:
-      '{{ (resources.Get "audio/laser.wav" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/laser.wav" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'starship-freighter-solid',
     sound:
-      '{{ (resources.Get "audio/chewbacca.wav" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/chewbacca.wav" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'starship-solid',
     sound:
-      '{{ (resources.Get "audio/intercom.wav" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/intercom.wav" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'ring-duotone',
     sound:
-      '{{ (resources.Get "audio/ring.wav" | resources.Fingerprint).RelPermalink }}'
+      '{{ (resources.Get "audio/ring.wav" | resources.Fingerprint).RelPermalink }}',
   },
   {
     icon: 'ghost-duotone',
     sound:
-      '{{ (resources.Get "audio/death.mp3" | resources.Fingerprint).RelPermalink }}'
-  }
+      '{{ (resources.Get "audio/death.mp3" | resources.Fingerprint).RelPermalink }}',
+  },
 ]
diff --git a/themes/default/assets/js/modal.js b/themes/default/assets/js/modal.js
@@ -1,5 +1,5 @@
-globalThis?.addEventListener('DOMContentLoaded', () => {
-  const document = globalThis?.document
+globalThis.addEventListener('DOMContentLoaded', () => {
+  const document = globalThis.document
   if (document == null) return
   initHandlers(document)
 })

diff --git a/themes/default/assets/js/theme.js b/themes/default/assets/js/theme.js
@@ -1,5 +1,5 @@
-globalThis?.addEventListener('DOMContentLoaded', () => {
-  const document = globalThis?.document
+globalThis.addEventListener('DOMContentLoaded', () => {
+  const document = globalThis.document
   if (document == null) return
   initHandlers(document)
 })
@@ -24,26 +24,26 @@ const initHandler = (document, element) => {
 const toggleTheme = (document) => {
   const colorScheme = activeColorScheme === 'dark' ? 'light' : 'dark'
   document.querySelector('html').classList.add('theme-transistion')
-  setTimeout(() => {
+  globalThis.setTimeout(() => {
     setTheme(document, colorScheme)
   }, 0)
-  setTimeout(() => {
+  globalThis.setTimeout(() => {
     document.querySelector('html').classList.remove('theme-transistion')
   }, 2000)
 }
 
 const setTheme = (document, colorScheme) => {
   activeColorScheme = colorScheme
-  globalThis?.sessionStorage?.setItem('activeColorScheme', colorScheme)
+  globalThis.sessionStorage?.setItem('activeColorScheme', colorScheme)
   document.querySelector('html').setAttribute('data-theme', colorScheme)
 }
 
 const getActiveTheme = () =>
-  globalThis?.sessionStorage?.getItem('activeColorScheme') ??
+  globalThis.sessionStorage?.getItem('activeColorScheme') ??
   preferedColorScheme()
 
 const preferedColorScheme = () => {
-  const matchMedia = globalThis?.matchMedia
+  const matchMedia = globalThis.matchMedia
   if (matchMedia == null) return
   const isDark = matchMedia('(prefers-color-scheme: dark)').matches
   return isDark ? 'dark' : 'light'