refactor(js): avoid variable leakage in rollup output

cotes2020 · Aug 18, 2024 · 117b0fc · 117b0fc
1 parent 11fd349
commit 117b0fc
Showing 1 changed file with 26 additions and 24 deletions.
diff --git a/_javascript/modules/components/img-popup.js b/_javascript/modules/components/img-popup.js
@@ -9,40 +9,42 @@ const lightImages = '.popup:not(.dark)';
 const darkImages = '.popup:not(.light)';
 let selector = lightImages;
 
-if (
- (html.hasAttribute('data-mode') &&
- html.getAttribute('data-mode') === 'dark') ||
- (!html.hasAttribute('data-mode') &&
- window.matchMedia('(prefers-color-scheme: dark)').matches)
-) {
- selector = darkImages;
-}
-
-let lightbox = GLightbox({ selector: `${selector}` });
-
-function updateImages(event) {
- if (
- event.source === window &&
- event.data &&
- event.data.direction === ModeToggle.ID
- ) {
- if (selector === lightImages) {
- selector = darkImages;
- } else {
- selector = lightImages;
- }
+function updateImages(lightbox) {
+ if (selector === lightImages) {
+ selector = darkImages;
+ } else {
+ selector = lightImages;
  }
 
  lightbox.destroy();
  lightbox = GLightbox({ selector: `${selector}` });
 }
 
 export function imgPopup() {
- if (document.querySelector(`${selector}`) === null) {
+ if (document.querySelector('.popup') === null) {
  return;
  }
 
+ if (
+ (html.hasAttribute('data-mode') &&
+ html.getAttribute('data-mode') === 'dark') ||
+ (!html.hasAttribute('data-mode') &&
+ window.matchMedia('(prefers-color-scheme: dark)').matches)
+ ) {
+ selector = darkImages;
+ }
+
+ let lightbox = GLightbox({ selector: `${selector}` });
+
  if (document.getElementById('mode-toggle')) {
- window.addEventListener('message', updateImages);
+ window.addEventListener('message', (event) => {
+ if (
+ event.source === window &&
+ event.data &&
+ event.data.direction === ModeToggle.ID
+ ) {
+ updateImages(lightbox);
+ }
+ });
  }
 }