refactor: improve js module loading order

okmalls · Apr 28, 2024 · b77767f · b77767f
1 parent e0950fc
commit b77767f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 17 deletions.
diff --git a/_includes/js-selector.html b/_includes/js-selector.html
@@ -65,7 +65,7 @@
 {% endcase %}
 
 {% capture script %}{{ js_dist }}{{ js }}.min.js{% endcapture %}
-<script defer src="{{ script | relative_url }}"></script>
+<script src="{{ script | relative_url }}"></script>
 
 {% if page.math %}
   <!-- MathJax -->
@@ -88,6 +88,10 @@
   {% endif %}
 {% endif %}
 
+{% if page.mermaid %}
+  {% include mermaid.html %}
+{% endif %}
+
 {% if jekyll.environment == 'production' %}
   <!-- PWA -->
   {% if site.pwa.enabled %}

diff --git a/_javascript/commons.js b/_javascript/commons.js
@@ -1,5 +1,5 @@
 import { basic, initSidebar, initTopbar } from './modules/layouts';
 
-basic();
 initSidebar();
 initTopbar();
+basic();
diff --git a/_javascript/home.js b/_javascript/home.js
@@ -1,8 +1,8 @@
 import { basic, initSidebar, initTopbar } from './modules/layouts';
 import { initLocaleDatetime, loadImg } from './modules/plugins';
 
-basic();
+loadImg();
+initLocaleDatetime();
 initSidebar();
 initTopbar();
-initLocaleDatetime();
-loadImg();
+basic();
diff --git a/_javascript/misc.js b/_javascript/misc.js
@@ -1,7 +1,7 @@
 import { basic, initSidebar, initTopbar } from './modules/layouts';
 import { initLocaleDatetime } from './modules/plugins';
 
-basic();
 initSidebar();
 initTopbar();
 initLocaleDatetime();
+basic();
diff --git a/_javascript/page.js b/_javascript/page.js
@@ -1,9 +1,9 @@
 import { basic, initSidebar, initTopbar } from './modules/layouts';
 import { loadImg, imgPopup, initClipboard } from './modules/plugins';
 
-basic();
-initSidebar();
-initTopbar();
 loadImg();
 imgPopup();
+initSidebar();
+initTopbar();
 initClipboard();
+basic();
diff --git a/_javascript/post.js b/_javascript/post.js
@@ -7,11 +7,11 @@ import {
   toc
 } from './modules/plugins';
 
-initSidebar();
-initTopbar();
 loadImg();
+toc();
 imgPopup();
+initSidebar();
 initLocaleDatetime();
 initClipboard();
-toc();
+initTopbar();
 basic();
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -75,13 +75,8 @@
     {% endif %}
 
     <!-- JavaScripts -->
-
     {% include js-selector.html lang=lang %}
 
-    {% if page.mermaid %}
-      {% include mermaid.html %}
-    {% endif %}
-
     {% include_cached search-loader.html lang=lang %}
   </body>
 </html>