re

layouts/gallery/single.html

@@ -20,15 +20,11 @@
 {{ partial "body/photoswipe" . }}
 
 {{ $masonry := resources.Get `js/masonry.pkgd.min.js` | fingerprint }}
-{{ $enquire := resources.Get `js/enquire.min.js` | fingerprint }}
+<script defer src="{{ $masonry.RelPermalink }}"></script>
 {{ $imagesloaded := resources.Get `js/imagesloaded.pkgd.min.js` | fingerprint }}
+<script defer src="{{ $imagesloaded.RelPermalink }}"></script>
 
 <script>
-  fetchInject([
-    "{{ $masonry.RelPermalink }}",
-    "{{ $imagesloaded.RelPermalink }}",
-    "{{ $enquire.RelPermalink }}",
-  ]).then(() => {
   var $grid = $('.grid').masonry({
     itemSelector: '.grid-item',
     columnWidth: '.grid-sizer',
@@ -91,8 +87,6 @@
       $('.grid-sizer').removeClass('quarter');
     },
   });   
-
-  });    
 </script>
 
 {{ end }}

layouts/partials/body/perfectscrollbar.html

@@ -1,15 +1,12 @@
 {{ if $.Param "enableCustomScrollbar" }}
 
 {{ $customscrollbar := resources.Get `js/perfect-scrollbar.jquery.min.js` | fingerprint }}
+<script defer src="{{ $customscrollbar.RelPermalink }}"></script>
 {{ $customScrollbarStyle := resources.Get "css/perfect-scrollbar.min.css" }}
+<script defer src="{{ $customScrollbarStyle.RelPermalink }}"></script>
 
 <script>  
-  fetchInject([      
-      "{{ $customscrollbar.RelPermalink }}",
-      "{{ $customScrollbarStyle.RelPermalink }}",      
-    ]).then(() => {      
   var pre = $('pre');
   pre.perfectScrollbar(); 
-    });    
 </script>
 {{ end }}

layouts/partials/body/photoswipe.html

@@ -68,23 +68,21 @@
 </div>
 
 {{ $photoSwipe := resources.Get `js/photoswipe.min.js` | fingerprint }}
+<script defer src="{{ $photoSwipe.RelPermalink }}"></script>
 {{ $photoSwipeUi := resources.Get `js/photoswipe-ui-default.min.js` | fingerprint }}
+<script defer src="{{ $photoSwipeUi.RelPermalink }}"></script>
 {{ $photoSwipeStyle := resources.Get "css/photoswipe/photoswipe.css" }}
+<script defer src="{{ $photoSwipeStyle.RelPermalink }}"></script>
 {{ $photoSwipeSkin := resources.Get "css/photoswipe/custom-skin.css" }}
+<script defer src="{{ $photoSwipeSkin.RelPermalink }}"></script>
 
 <script>
-  fetchInject([
-    "{{ $photoSwipe.RelPermalink }}",
-    "{{ $photoSwipeUi.RelPermalink }}",
-    "{{ $photoSwipeStyle.RelPermalink }}",
-    "{{ $photoSwipeSkin.RelPermalink }}",
-  ]).then(() => {
   var pswpElement = $('.pswp')[0];
   var imgElements = $('.single__contents').find('img');
   var items = [];
 
   imgElements.each(function (i, v) {
-      $(this).click(function(e) {
+    $(this).click(function (e) {
       initGallery(i);
     });
     $(this).css('cursor', 'pointer');
@@ -119,7 +117,6 @@
     })
     gallery.init();
   }  
-  });    
 </script>
 
 {{ end }}

layouts/partials/head/scripts.html

@@ -1,5 +1,3 @@
-{{ $fetchinject := resources.Get "js/fetch-inject.umd.min.js" | resources.Fingerprint }}
-<script src="{{ $fetchinject.RelPermalink }}"></script>
 {{ $jquery := resources.Get "js/jquery.min.js" | resources.Fingerprint }}
 <script src="{{ $jquery.RelPermalink }}"></script>
 {{ $enquire := resources.Get "js/enquire.min.js" | resources.Fingerprint }}

layouts/partials/sidebar/sidebar-single.html

@@ -8,11 +8,9 @@
 </div>
 
 {{ $toc := resources.Get `js/jquery.toc.min.js` | fingerprint }}
+<script defer src="{{ $toc.RelPermalink }}"></script>
 
 <script>
-  fetchInject([
-    "{{ $toc.RelPermalink }}",
-  ]).then(() => {   
   var navbar = $('.navbar');
 
   $("#toc").toc({ content: ".single__contents", headings: "h1,h2,h3,h4" });
@@ -50,7 +48,7 @@
       "</span>"
       ;
   });
-    headers.on('mouseenter', function() {
+  headers.on('mouseenter', function () {
     $(this).find('.anchor').attr('class', 'anchor');
   });
   headers.on('mouseleave', function () {
@@ -105,7 +103,6 @@
       });
     }
   });  
-  });    
 </script>
 
 {{ end }}

layouts/partials/sidebar/site-mark.html

@@ -1,10 +1,8 @@
 {{ if $.Param "enableMark" }}
 {{ $mark := resources.Get "js/jquery.mark.min.js" | fingerprint }}
+<script defer src="{{ $mark.RelPermalink }}"></script>
 
 <script>
-  fetchInject([
-    "{{ $mark.RelPermalink }}",
-  ]).then(() => {    
   var mark = function () {
     var keyword = $("#search").val();
     var options = {
@@ -36,6 +34,5 @@
   };
 
   $("#search").on("input", mark);
-  });
 </script>
 {{ end }}

layouts/partials/sidebar/site-search.html

@@ -13,6 +13,7 @@
 
 {{ partial "sidebar/site-mark" . }}
 {{ $lunr := resources.Get "js/lunr.min.js" | fingerprint }}
+<script defer src="{{ $lunr.RelPermalink }}"></script>
 
 <script>
   {{ if .Site.IsMultiLingual }}
@@ -20,9 +21,8 @@
   {{ else }}
       var baseurl = "{{.Site.BaseURL}}";
   {{ end }}
-  fetchInject([
-    "{{ $lunr.RelPermalink }}",
-  ]).then(() => {
+  
+  
   var lunrIndex = null;
   var pagesIndex = null;
   var searchResults = null;
@@ -50,7 +50,7 @@
           //this.field('categories');
 
           var that = this;
-            index.forEach(function(page) {
+          index.forEach(function (page) {
             that.add(page);
           });
         });
@@ -102,7 +102,7 @@
 
   initLunr();
 
-    $("#search").on('input', function(e) {
+  $("#search").on('input', function (e) {
     if (!e.target.value) {
       $('#search-results').attr('class', 'dropdown');
       return null;
@@ -111,8 +111,8 @@
     renderSearchResults(results);
   });
 
-    $('#search').on('blur', function() {
-      setTimeout(function() {
+  $('#search').on('blur', function () {
+    setTimeout(function () {
       $('#search-results').attr('class', 'dropdown');
     }, 100);
   });
@@ -126,7 +126,7 @@
     renderSearchResults(results);
   });
 
-    $('#search').on('keydown', function(e) {
+  $('#search').on('keydown', function (e) {
     var items = $('#search-menu .dropdown-item');
     var activeIndex = $('#search-menu .dropdown-item.is-active').index();
 
@@ -142,7 +142,5 @@
       }
     }
   });
-    
-  });
 </script>
 {{ end }}