Merge pull request #29 from amzrk2/dev

Release v2.0.1

3 files changed, 13 insertions, 20 deletions

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2d7362c..0603c4d 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -33,9 +33,6 @@
 {{ template "_internal/twitter_cards.html" . }}
 
 <!-- dep -->
-{{ if .Site.Params.mainAssetsCDN }}
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/amzrk2/hugo-theme-fuji@2.0/dist/fuji.min.css" />
-{{ else }}
 {{ if .Site.Params.useHugoPipes }}
 {{ $options := (dict "targetPath" "assets/css/fuji-custom.min.css" "outputStyle" "compressed") }}
 {{ $style := resources.Get "scss/fuji.scss" | resources.ToCSS $options }}
@@ -43,7 +40,7 @@
 {{ else }}
 <link rel="stylesheet" href="{{ "/assets/css/fuji.min.css" | relURL }}" />
 {{ end }}
-{{ end }}
+
 {{ if .Params.playerURL }}
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.css" />
 {{ end }}
diff --git a/layouts/partials/scripts-end.html b/layouts/partials/scripts-end.html
index 3cbc866..862e0e2 100644
--- a/layouts/partials/scripts-end.html
+++ b/layouts/partials/scripts-end.html
@@ -1,14 +1,11 @@
-<script src="https://cdn.jsdelivr.net/npm/lazysizes@5.2.2/lazysizes.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/medium-zoom@1.0.5/dist/medium-zoom.min.js"></script>
-<script type="module" src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.esm.js"></script>
-<script nomodule="" src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.js"></script>
-{{ if .Site.Params.mainAssetsCDN }}
-<script src="https://cdn.jsdelivr.net/gh/amzrk2/hugo-theme-fuji@2.0/dist/fuji.min.js"></script>
-{{ else }}
-<script src="{{ "/assets/js/fuji.min.js" | relURL }}"></script>
-{{ end }}
-<script src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/components/prism-core.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/plugins/autoloader/prism-autoloader.min.js"></script>
+<script async type="module" src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.esm.js"></script>
+<script async nomodule src="https://cdn.jsdelivr.net/npm/ionicons@5.0.1/dist/ionicons/ionicons.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/components/prism-core.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/prismjs@1.20.0/plugins/autoloader/prism-autoloader.min.js"></script>
+
+<script defer src="https://cdn.jsdelivr.net/npm/lazysizes@5.2.2/lazysizes.min.js"></script>
+<script defer src="https://cdn.jsdelivr.net/npm/medium-zoom@1.0.5/dist/medium-zoom.min.js"></script>
+<script defer src="{{ "/assets/js/fuji.min.js" | relURL }}"></script>
 
 {{ with .Params.playerURL }}
 <script src="https://cdn.jsdelivr.net/npm/aplayer@1.10.1/dist/APlayer.min.js"></script>
diff --git a/layouts/partials/scripts-front.html b/layouts/partials/scripts-front.html
index c516aad..6b4d78b 100644
--- a/layouts/partials/scripts-front.html
+++ b/layouts/partials/scripts-front.html
@@ -13,16 +13,15 @@
 </script>
 <script data-cfasync="false">
     // ie detection
-    var ua = window.navigator.userAgent;
-
-    function browserDetection() {
-        if (ua.indexOf('MSIE ') > 0 || ua.indexOf('Trident/') > 0 || ua.indexOf('Edge/') > 0) {
+    function browserDetection(ua) {
+        if (ua.indexOf('MSIE ') > 0 || ua.indexOf('Trident/') > 0) {
             return true;
         }
         return false;
     }
 
-    if (browserDetection()) {
+    var ua = window.navigator.userAgent;
+    if (browserDetection(ua)) {
         window.location.href('{{ "/ie/" | absURL }}');
     }
 </script>
\ No newline at end of file