fix of theme selector

webtor-io · Sep 25, 2024 · 537bac6 · 537bac6
1 parent c7ba1a8
commit 537bac6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/assets/src/js/app/layout.js b/assets/src/js/app/layout.js
@@ -13,14 +13,14 @@ window.progress = {
 };
 
 import {bindAsync} from '../lib/async';
-// const av = (await import('../lib/asyncView')).initAsyncView;
+const av = (await import('../lib/asyncView')).initAsyncView;
 import themeSelector from "../lib/themeSelector";
 
 function onLoad() {
     themeSelector(document.querySelector('[data-toggle-theme]'));
-    // av(document.querySelector('nav'), 'index', async function() {
-    //     themeSelector(document.querySelector('[data-toggle-theme]'));
-    // });
+    av(document.querySelector('nav'), 'index', async function() {
+        themeSelector(document.querySelector('[data-toggle-theme]'));
+    });
     document.body.style.display = 'flex';
     hideProgress();
     bindAsync({

diff --git a/assets/src/js/lib/asyncView.js b/assets/src/js/lib/asyncView.js
@@ -35,7 +35,10 @@ export function initAsyncView(target, name, init, destroy) {
         }
         window.dispatchEvent(event);
     } 
-    const key = `__async${name}_loaded`;
+    let keySuffix = '';
+    if (init) keySuffix += init.toString();
+    if (destroy) keySuffix += destroy.toString();
+    let key = `__async${name}_loaded_${MD5(keySuffix)}`;
     if (!window[key]) {
         window.addEventListener(`async:${name}`, onLoad);
         window.addEventListener(`async:${name}_destroy`, onDestroy);