From d2d0c16b2fc3d2f77c96e971e5908184c4708971 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Thu, 27 Dec 2018 11:06:53 +0800
Subject: [PATCH] update

---
 layout/_partial/head.ejs         |  26 +++---
 layout/_partial/scripts.ejs      | 155 +++++++++++++++----------------
 layout/_third-party/comments.ejs |  72 +++++++-------
 3 files changed, 123 insertions(+), 130 deletions(-)

diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
index f3ba48d..a3834f9 100755
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@@ -36,18 +36,21 @@
   <meta name="HandheldFriendly" content="True" />
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-
-  <!-- link -->
-  <% if (config.import && config.import.link){ %>
-  <% (config.import.link||[]).forEach(function(item){ %>
-  <link rel="<%= item.rel %>" <% if (item.type){ %>type="<%= item.type %>"<% } %> <% if (item.sizes){ %>sizes="<%= item.sizes %>"<% } %> href="<%- item.href %>" <% if (item.color){ %>color="<%= item.color %>"<% } %>>
-  <% }) %>
-  <% } %>
-
   <!-- meta -->
   <% if (config.import && config.import.meta){ %>
   <% (config.import.meta||[]).forEach(function(item){ %>
-  <meta name="<%= item.name %>" href="<%- item.content %>">
+  <meta name="<%= item.name %>" content="<%- item.content %>">
+  <% }) %>
+  <% } %>
+  <!-- link -->
+  <% if (config.import && config.import.link){ %>
+  <% (config.import.link||[]).forEach(function(item){ %>
+  <link rel="<%= item.rel %>" href="<%- item.href %>"
+  <% if (item.type){ %> type="<%= item.type %>"<% } %>
+  <% if (item.sizes){ %> sizes="<%= item.sizes %>"<% } %>
+  <% if (item.media){ %> media="<%= item.media %>"<% } %>
+  <% if (item.hreflang){ %> hreflang="<%= item.hreflang %>"<% } %>
+  <% if (item.color){ %> color="<%= item.color %>"<% } %>>
   <% }) %>
   <% } %>
 
@@ -60,11 +63,6 @@
   <%- css('style.css') %>
   <% } %>
 
-  <% if (config.import && config.import.google_fonts && config.import.google_fonts.length > 0){ %>
-  <!-- google_fonts -->
-  <link href="<%= config.import.google_fonts %>" rel="stylesheet">
-  <% } %>
-
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@5.6.3/css/all.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/node-waves@0.7.6/dist/waves.min.css">
 
diff --git a/layout/_partial/scripts.ejs b/layout/_partial/scripts.ejs
index 3863cc2..5281179 100755
--- a/layout/_partial/scripts.ejs
+++ b/layout/_partial/scripts.ejs
@@ -11,24 +11,6 @@
   }, false)
 </script>
 
-<% if (theme.search && theme.search.enable) { %>
-    <script>
-        var GOOGLE_CUSTOM_SEARCH_API_KEY = "<%- theme.search.google_api_key %>";
-        var GOOGLE_CUSTOM_SEARCH_ENGINE_ID = "<%- theme.search.google_engine_id %>";
-        var ALGOLIA_API_KEY = "<%- theme.search.algolia_api_key %>";
-        var ALGOLIA_APP_ID = "<%- theme.search.algolia_app_id %>";
-        var ALGOLIA_INDEX_NAME = "<%- theme.search.algolia_index_name %>";
-        var AZURE_SERVICE_NAME = "<%- theme.search.azure_service_name %>";
-        var AZURE_INDEX_NAME = "<%- theme.search.azure_index_name %>";
-        var AZURE_QUERY_KEY = "<%- theme.search.azure_query_key %>";
-        var BAIDU_API_ID = "<%- theme.search.baidu_api_id %>";
-        var SEARCH_SERVICE = "<%- theme.search.service%>" || "hexo";
-        var ROOT = "<%- config.root %>"||"/";
-        if(!ROOT.endsWith('/'))ROOT += '/';
-    </script>
-<% } %>
-
-
 <% if (config.import && config.import.js == true) { %>
   <%- js([theme.theme_info.cdn + 'js/app.js', theme.theme_info.cdn + 'js/search.js']) %>
 <% } else if (config.import && config.import.js && config.import.js.length > 0) { %>
@@ -37,72 +19,85 @@
   <%- js(['js/app.js', 'js/search.js']) %>
 <% } %>
 
+<% if (theme.search && theme.search.enable) { %>
+  <script>
+    var GOOGLE_CUSTOM_SEARCH_API_KEY = "<%- theme.search.google_api_key %>";
+    var GOOGLE_CUSTOM_SEARCH_ENGINE_ID = "<%- theme.search.google_engine_id %>";
+    var ALGOLIA_API_KEY = "<%- theme.search.algolia_api_key %>";
+    var ALGOLIA_APP_ID = "<%- theme.search.algolia_app_id %>";
+    var ALGOLIA_INDEX_NAME = "<%- theme.search.algolia_index_name %>";
+    var AZURE_SERVICE_NAME = "<%- theme.search.azure_service_name %>";
+    var AZURE_INDEX_NAME = "<%- theme.search.azure_index_name %>";
+    var AZURE_QUERY_KEY = "<%- theme.search.azure_query_key %>";
+    var BAIDU_API_ID = "<%- theme.search.baidu_api_id %>";
+    var SEARCH_SERVICE = "<%- theme.search.service%>" || "hexo";
+    var ROOT = "<%- config.root %>"||"/";
+    if(!ROOT.endsWith('/'))ROOT += '/';
+  </script>
+<% } %>
 
-<% if (page.comments) { %>
-    <% if (config.disqus_shortname){ %>
-        <script>
-            var disqus_shortname = '<%= config.disqus_shortname %>';
-            <% if (page.permalink){ %>
-                var disqus_url = '<%= page.permalink %>';
-            <% } %>
-            (function(){
-                var dsq = document.createElement('script');
-                dsq.type = 'text/javascript';
-                dsq.async = true;
-                dsq.src = '//' + disqus_shortname + '.disqus.com/<% if (page.comments) { %>embed.js<% } else { %>count.js<% } %>';
-                (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-            })();
-        </script>
-    <% } %>
-    <% if (config.livere_uid){ %>
-        <script type="text/javascript">
-           (function(d, s) {
-               var j, e = d.getElementsByTagName(s)[0];
-               if (typeof LivereTower === 'function') { return; }
-               j = d.createElement(s);
-               j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
-               j.async = true;
-               e.parentNode.insertBefore(j, e);
-           })(document, 'script');
-        </script>
-    <% } %>
-    <% if (config.valine){ %>
-        <% if (config.valine.enable && config.valine.app_id && config.valine.app_key){ %>
-            <script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>
-            <% if (config.import && config.import.js == true) { %>
-              <script src="https://cdn.jsdelivr.net/gh/xaoxuu/volantis@1.0/js/volantis.min.js"></script>
-            <% } else { %>
-              <%- js('js/volantis.js') %>
-            <% } %>
-            <script>
-            var GUEST_INFO = ['nick','mail','link'];
-            var guest_info = '<%= config.valine.guest_info %>'.split(',').filter(function(item){
-                return GUEST_INFO.indexOf(item) > -1
-            });
-            var notify = '<%= config.valine.notify %>' == true;
-            var verify = '<%= config.valine.verify %>' == true;
-            var valine = new Valine();
-            valine.init({
-                el: '#valine_container',
-                notify: notify,
-                verify: verify,
-                guest_info: guest_info,
-                appId: "<%= config.valine.app_id %>",
-                appKey: "<%= config.valine.app_key %>",
-                placeholder: "<%= config.valine.placeholder %>",
-                pageSize:'<%= config.valine.pageSize %>',
-                avatar:'<%= config.valine.avatar %>',
-                lang:'<%= config.valine.lang %>',
-                highlight:'<%= config.valine.highlight %>'
-            })
-            </script>
-
-        <% } %>
+<% if ((page.layout == 'post' && page.comments != false) || page.comments == true) { %>
+  <% if (config.disqus_shortname){ %>
+    <script>
+      var disqus_shortname = '<%= config.disqus_shortname %>';
+      <% if (page.permalink){ %>
+        var disqus_url = '<%= page.permalink %>';
+      <% } %>
+      (function(){
+        var dsq = document.createElement('script');
+        dsq.type = 'text/javascript';
+        dsq.async = true;
+        dsq.src = '//' + disqus_shortname + '.disqus.com/<% if (page.comments) { %>embed.js<% } else { %>count.js<% } %>';
+        (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+      })();
+    </script>
+  <% } %>
+  <% if (config.livere_uid){ %>
+    <script type="text/javascript">
+      (function(d, s) {
+        var j, e = d.getElementsByTagName(s)[0];
+        if (typeof LivereTower === 'function') { return; }
+        j = d.createElement(s);
+        j.src = 'https://cdn-city.livere.com/js/embed.dist.js';
+        j.async = true;
+        e.parentNode.insertBefore(j, e);
+      })(document, 'script');
+    </script>
+  <% } %>
+  <% if (config.valine){ %>
+    <% if (config.valine.enable && config.valine.app_id && config.valine.app_key){ %>
+      <script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>
+      <% if (config.import && config.import.js == true) { %>
+        <script src="https://cdn.jsdelivr.net/gh/xaoxuu/volantis@1.0/js/volantis.min.js"></script>
+      <% } else { %>
+        <%- js('js/volantis.js') %>
+      <% } %>
+      <script>
+      var GUEST_INFO = ['nick','mail','link'];
+      var guest_info = '<%= config.valine.guest_info %>'.split(',').filter(function(item){
+        return GUEST_INFO.indexOf(item) > -1
+      });
+      var notify = '<%= config.valine.notify %>' == true;
+      var verify = '<%= config.valine.verify %>' == true;
+      var valine = new Valine();
+      valine.init({
+        el: '#valine_container',
+        notify: notify,
+        verify: verify,
+        guest_info: guest_info,
+        appId: "<%= config.valine.app_id %>",
+        appKey: "<%= config.valine.app_key %>",
+        placeholder: "<%= config.valine.placeholder %>",
+        pageSize:'<%= config.valine.pageSize %>',
+        avatar:'<%= config.valine.avatar %>',
+        lang:'<%= config.valine.lang %>',
+        highlight:'<%= config.valine.highlight %>'
+      })
+      </script>
     <% } %>
+  <% } %>
 <% } %>
 
-
-
 <!-- leancloud_visitors -->
 <% if (config.leancloud_visitors && config.leancloud_visitors.app_id && config.leancloud_visitors.app_key) { %>
   <script src="https://cdn.jsdelivr.net/gh/xaoxuu/cdn-leancloud@18.12.24/js/av-core-mini-0.6.4.js"></script>
diff --git a/layout/_third-party/comments.ejs b/layout/_third-party/comments.ejs
index 5c0885c..8b1f5f2 100644
--- a/layout/_third-party/comments.ejs
+++ b/layout/_third-party/comments.ejs
@@ -1,44 +1,44 @@
 <!-- 显示推荐文章和评论 -->
 <% if (page && ((theme.recommended_posts && theme.recommended_posts.autoDisplay == false && page.recommended_posts != false) || (page.comments && (config.disqus_shortname || config.livere_shortname || config.valine)) )) { %>
-    <article class="post white-box comments">
-        <section class="article typo">
+  <article class="post white-box comments">
+    <section class="article typo">
 
-            <% if (theme.recommended_posts && theme.recommended_posts.autoDisplay == false && page.recommended_posts != false) { %>
-                <%- partial('recommended_posts', {page: page, site: site}) %>
-            <% } %>
+      <% if (theme.recommended_posts && theme.recommended_posts.autoDisplay == false && page.recommended_posts != false) { %>
+        <%- partial('recommended_posts', {page: page, site: site}) %>
+      <% } %>
 
-            <% if (page.comments) { %>
+      <% if (page.comments) { %>
 
-                <h4><i class="fas fa-comments fa-fw" aria-hidden="true"></i>&nbsp;评论</h4>
-                <% if (config.disqus_shortname) { %>
-                    <section id="comments">
-                        <div id="disqus_thread">
-                            ⚠️  无法加载评论系统，请确保您的网络能够正常访问 <a href="https://disqus.com">Disqus</a> 。
-                        </div>
-                    </section>
-                <% } %>
+        <h4><i class="fas fa-comments fa-fw" aria-hidden="true"></i>&nbsp;评论</h4>
+        <% if (config.disqus_shortname) { %>
+          <section id="comments">
+            <div id="disqus_thread">
+              ⚠️  无法加载评论系统，请确保您的网络能够正常访问 <a href="https://disqus.com">Disqus</a> 。
+            </div>
+          </section>
+        <% } %>
 
-                <% if (config.livere_uid){ %>
-                    <section id="comments">
-                        <div id="lv-container" data-id="city" data-uid="<%= config.livere_uid %>">
-                            <noscript>为正常使用来必力评论功能请激活JavaScript</noscript>
-                        </div>
-                    </section>
-                <% } %>
+        <% if (config.livere_uid){ %>
+          <section id="comments">
+            <div id="lv-container" data-id="city" data-uid="<%= config.livere_uid %>">
+              <noscript>为正常使用来必力评论功能请激活JavaScript</noscript>
+            </div>
+          </section>
+        <% } %>
 
-                <% if (config.valine){ %>
-                    <% if (config.valine.enable && config.valine.app_id && config.valine.app_key){ %>
-                        <div class="subtitle">
-                          <h6><b>文明评论，请勿灌水。</b>为了便于区分和接收回复提醒，请您在留言时填写一下<b>昵称</b>和<b>邮箱</b>。</h6>
-                        <div>
-                        <section id="comments">
-                            <div id="valine_container" class="valine_thread">
-                                <i class="fas fa-spinner fa-spin fa-fw"></i>
-                            </div>
-                        </section>
-                    <% } %>
-                <% } %>
-            <% } %>
-        </section>
-    </article>
+        <% if (config.valine){ %>
+          <% if (config.valine.enable && config.valine.app_id && config.valine.app_key){ %>
+            <div class="subtitle">
+              <h6><b>文明评论，请勿灌水。</b>为了便于区分和接收回复提醒，请您在留言时填写一下<b>昵称</b>和<b>邮箱</b>。</h6>
+            <div>
+            <section id="comments">
+              <div id="valine_container" class="valine_thread">
+                <i class="fas fa-spinner fa-spin fa-fw"></i>
+              </div>
+            </section>
+          <% } %>
+        <% } %>
+      <% } %>
+    </section>
+  </article>
 <% } %>