From 43445049e5513fd7039fef8f52e9ee059a9f36e8 Mon Sep 17 00:00:00 2001
From: 186526 <i@186526.xyz>
Date: Thu, 31 Dec 2020 21:55:05 +0800
Subject: [PATCH] Update Theme

---
 themes/suka/layout/_pages/post.ejs                 |  9 +++++++++
 themes/suka/layout/_partial/source/head.ejs        |  6 ------
 themes/suka/layout/_plugin/comment/valine/main.ejs | 10 ++++++----
 themes/suka/source/js/blog-186.js                  |  8 +++++---
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/themes/suka/layout/_pages/post.ejs b/themes/suka/layout/_pages/post.ejs
index f2b2c38..914149b 100644
--- a/themes/suka/layout/_pages/post.ejs
+++ b/themes/suka/layout/_pages/post.ejs
@@ -1,4 +1,13 @@
 <div class="post-container pjax">
+        <%- fragment_cache('head_hljs_css', () => {
+            let html = '';
+            if (theme.vendors.suka.highlight_theme) {
+                html += css_async(theme.vendors.suka.highlight_theme);
+            } else if (theme.highlight.theme) {
+                html += css_async(url_for('css/highlight/' + theme.highlight.theme + '.min.css'));
+            }
+            return html;
+        }) %>
     <div id="post-card" class="card">
         <% if (page.thumbnail) { %>
             <div class="card-image lazyload" data-bg="url('<%= page.thumbnail %>')"></div>
diff --git a/themes/suka/layout/_partial/source/head.ejs b/themes/suka/layout/_partial/source/head.ejs
index 6f8d759..2f8a920 100644
--- a/themes/suka/layout/_partial/source/head.ejs
+++ b/themes/suka/layout/_partial/source/head.ejs
@@ -37,12 +37,6 @@
     <%- partial('_plugin/highlight/prettify/theme') %>
 <% } %>
 
-<% if (config.highlight.enable) { %>
-    <!-- Prettify Theme -->
-    <%- partial('_plugin/highlight/hexo-hljs/theme') %>
-<% } %>
-
-
 <script>
 /*! loadCSS. [c]2017 Filament Group, Inc. MIT License */
 !function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){var e=t.media||"all";function a(){t.addEventListener?t.removeEventListener("load",a):t.attachEvent&&t.detachEvent("onload",a),t.setAttribute("onload",null),t.media=e}t.addEventListener?t.addEventListener("load",a):t.attachEvent&&t.attachEvent("onload",a),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(a,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);
diff --git a/themes/suka/layout/_plugin/comment/valine/main.ejs b/themes/suka/layout/_plugin/comment/valine/main.ejs
index c6222ac..4e38673 100644
--- a/themes/suka/layout/_plugin/comment/valine/main.ejs
+++ b/themes/suka/layout/_plugin/comment/valine/main.ejs
@@ -1,4 +1,7 @@
-<div id="vcomments">Loading……<noscript>启动js来查看评论</noscript></div>
+<div id="vcomments">Loading……
+    <a onclick="window.valinenow();">强制加载Valine</a>
+    <noscript>启动js来查看评论</noscript>
+</div>
 
 <!--<script src="https://cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>-->
 <!--<script src="https://cdn.jsdelivr.net/npm/valine@latest/dist/Valine.min.js"></script>-->
@@ -46,9 +49,8 @@
             valinenow();
         }
     }
-    window.addEventListener('load', () => {
-        valinedo();
-    });
+    document.dispatchEvent(new window.Event("LoadValine"));
+    valinedo();
     if(!window.whenAvailable){
         let whenAvailable = (name, callback) => {
             var interval = 100;
diff --git a/themes/suka/source/js/blog-186.js b/themes/suka/source/js/blog-186.js
index ed137ae..b8da55c 100644
--- a/themes/suka/source/js/blog-186.js
+++ b/themes/suka/source/js/blog-186.js
@@ -64,14 +64,16 @@ let suc = () => {
     whenAvailable("LazyLoad", () => {
         new LazyLoad();
     });
-    if (window.valinedo) {
-        valinedo();
-    }
     window.dataLayer = window.dataLayer || [];
     function gtag() { dataLayer.push(arguments); }
     gtag('js', new Date());
     gtag('config', 'G-ENYRL7T64N');
 };
+document.addEventListener('LoadValine',()=>{
+    if(document.querySelector("#vcomments")){
+        valinedo();
+    }
+});
 let whenAvailable = (name, callback) => {
     var interval = 100;
     window.setTimeout(function () {