From e953cbf4b0d31c7c1f317ca48fcf096010f92168 Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Thu, 23 Jul 2020 15:16:28 +0800
Subject: [PATCH] Refactor next_font helper & NexT.utils.loadComments

---
 layout/_third-party/comments/changyan.njk | 2 +-
 layout/_third-party/comments/disqus.njk   | 2 +-
 layout/_third-party/comments/disqusjs.njk | 2 +-
 layout/_third-party/comments/gitalk.njk   | 2 +-
 layout/_third-party/comments/livere.njk   | 2 +-
 layout/_third-party/comments/valine.njk   | 2 +-
 scripts/helpers/font.js                   | 9 +++++----
 source/css/_variables/base.styl           | 2 +-
 source/js/utils.js                        | 3 ++-
 9 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/layout/_third-party/comments/changyan.njk b/layout/_third-party/comments/changyan.njk
index a69e249..7c4de1b 100644
--- a/layout/_third-party/comments/changyan.njk
+++ b/layout/_third-party/comments/changyan.njk
@@ -2,7 +2,7 @@
   <script id="cy_cmt_num" src="https://changyan.sohu.com/upload/plugins/plugins.list.count.js?clientId={{ theme.changyan.appid }}"></script>
 {% elif page.comments %}
   <script>
-  NexT.utils.loadComments(document.querySelector('#SOHUCS'), () => {
+  NexT.utils.loadComments('#SOHUCS', () => {
     NexT.utils.getScript('https://changyan.sohu.com/upload/changyan.js', () => {
       window.changyan.api.config({
         appid: '{{ theme.changyan.appid }}',
diff --git a/layout/_third-party/comments/disqus.njk b/layout/_third-party/comments/disqus.njk
index 9c3353a..1e48e83 100644
--- a/layout/_third-party/comments/disqus.njk
+++ b/layout/_third-party/comments/disqus.njk
@@ -20,7 +20,7 @@
       this.language = '{{ __('disqus') }}';
     {% endif -%}
   };
-  NexT.utils.loadComments(document.querySelector('#disqus_thread'), () => {
+  NexT.utils.loadComments('#disqus_thread', () => {
     if (window.DISQUS) {
       DISQUS.reset({
         reload: true,
diff --git a/layout/_third-party/comments/disqusjs.njk b/layout/_third-party/comments/disqusjs.njk
index 78a6ddb..6e52931 100644
--- a/layout/_third-party/comments/disqusjs.njk
+++ b/layout/_third-party/comments/disqusjs.njk
@@ -5,7 +5,7 @@
 {%- set disqusjs_js_uri = theme.vendors.disqusjs_js or '//cdn.jsdelivr.net/npm/disqusjs@1/dist/disqus.js' %}
 
 <script>
-NexT.utils.loadComments(document.querySelector('#disqus_thread'), () => {
+NexT.utils.loadComments('#disqus_thread', () => {
   NexT.utils.getScript('{{ url_for(disqusjs_js_uri) }}', () => {
     window.dsqjs = new DisqusJS({
       api       : '{{ theme.disqusjs.api }}' || 'https://disqus.com/api/',
diff --git a/layout/_third-party/comments/gitalk.njk b/layout/_third-party/comments/gitalk.njk
index 38d839c..395ee03 100644
--- a/layout/_third-party/comments/gitalk.njk
+++ b/layout/_third-party/comments/gitalk.njk
@@ -5,7 +5,7 @@
 {%- set gitalk_js_uri = theme.vendors.gitalk_js or '//cdn.jsdelivr.net/npm/gitalk@1/dist/gitalk.min.js' %}
 
 <script>
-NexT.utils.loadComments(document.querySelector('#gitalk-container'), () => {
+NexT.utils.loadComments('#gitalk-container', () => {
   NexT.utils.getScript('{{ url_for(gitalk_js_uri) }}', () => {
     var gitalk = new Gitalk({
       clientID    : '{{ theme.gitalk.client_id }}',
diff --git a/layout/_third-party/comments/livere.njk b/layout/_third-party/comments/livere.njk
index d63b4eb..b9fbccc 100644
--- a/layout/_third-party/comments/livere.njk
+++ b/layout/_third-party/comments/livere.njk
@@ -1,6 +1,6 @@
 {%- if page.comments %}
 <script>
-NexT.utils.loadComments(document.querySelector('#lv-container'), () => {
+NexT.utils.loadComments('#lv-container', () => {
   window.livereOptions = {
     refer: location.pathname.replace(CONFIG.root, '').replace('index.html', '')
   };
diff --git a/layout/_third-party/comments/valine.njk b/layout/_third-party/comments/valine.njk
index a9351ba..6ea8120 100644
--- a/layout/_third-party/comments/valine.njk
+++ b/layout/_third-party/comments/valine.njk
@@ -1,7 +1,7 @@
 {%- set valine_uri = theme.vendors.valine or '//cdn.jsdelivr.net/npm/valine@1/dist/Valine.min.js' %}
 
 <script>
-NexT.utils.loadComments(document.querySelector('#valine-comments'), () => {
+NexT.utils.loadComments('#valine-comments', () => {
   NexT.utils.getScript('{{ url_for(valine_uri) }}', () => {
     new Valine(Object.assign({
       el  : '#valine-comments',
diff --git a/scripts/helpers/font.js b/scripts/helpers/font.js
index aafad05..41a9586 100644
--- a/scripts/helpers/font.js
+++ b/scripts/helpers/font.js
@@ -11,13 +11,14 @@ hexo.extend.helper.register('next_font', function() {
   const fontHost = config.host || '//fonts.googleapis.com';
 
   // Get a font list from config
-  let fontFamilies = ['global', 'title', 'headings', 'posts', 'codes'].map(item => {
+  let fontFamilies = [];
+  ['global', 'title', 'headings', 'posts', 'codes'].forEach(item => {
     if (config[item] && config[item].family && config[item].external) {
-      return config[item].family + fontStyles;
+      fontFamilies = fontFamilies.concat(config[item].family.split(','));
     }
-    return '';
-  }).filter(item => item !== '');
+  });
 
+  fontFamilies = fontFamilies.map(name => name.trim() + fontStyles);
   fontFamilies = [...new Set(fontFamilies)].join('|');
 
   // Merge extra parameters to the final processed font string
diff --git a/source/css/_variables/base.styl b/source/css/_variables/base.styl
index d497754..00d3289 100644
--- a/source/css/_variables/base.styl
+++ b/source/css/_variables/base.styl
@@ -71,7 +71,7 @@ $menu-item-bg-color-dark      = $black-light;
 // --------------------------------------------------
 get_font_family(config) {
   $custom-family = hexo-config('font.' + config + '.family');
-  return $custom-family is a 'string' ? $custom-family : null;
+  return $custom-family is a 'string' ? unquote($custom-family) : null;
 }
 
 // Font families.
diff --git a/source/js/utils.js b/source/js/utils.js
index 3851d6a..16cd211 100644
--- a/source/js/utils.js
+++ b/source/js/utils.js
@@ -348,7 +348,8 @@ NexT.utils = {
     }
   },
 
-  loadComments: function(element, callback) {
+  loadComments: function(selector, callback) {
+    const element = document.querySelector(selector);
     if (!CONFIG.comments.lazyload || !element) {
       callback();
       return;