From d6f7c51f6c13882986b1f51a2f673aa89bbd6d25 Mon Sep 17 00:00:00 2001
From: Mimi <1119186082@qq.com>
Date: Sun, 27 Dec 2020 14:44:19 +0800
Subject: [PATCH] Simplify the `.comments` element

---
 layout/_third-party/comments/gitalk.njk     | 4 ++--
 layout/_third-party/comments/utterances.njk | 4 ++--
 scripts/filters/comment/changyan.js         | 6 +-----
 scripts/filters/comment/disqus.js           | 6 ++----
 scripts/filters/comment/disqusjs.js         | 6 ++----
 scripts/filters/comment/gitalk.js           | 2 +-
 scripts/filters/comment/isso.js             | 6 +-----
 scripts/filters/comment/livere.js           | 6 +-----
 scripts/filters/comment/utterances.js       | 6 +-----
 source/js/algolia-search.js                 | 2 +-
 10 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/layout/_third-party/comments/gitalk.njk b/layout/_third-party/comments/gitalk.njk
index a66fcee..a25b6f7 100644
--- a/layout/_third-party/comments/gitalk.njk
+++ b/layout/_third-party/comments/gitalk.njk
@@ -2,7 +2,7 @@
 <link rel="stylesheet" href="{{ theme.vendors.gitalk_css }}">
 
 <script>
-NexT.utils.loadComments('#gitalk-container', () => {
+NexT.utils.loadComments('.gitalk-container', () => {
   NexT.utils.getScript('{{ theme.vendors.gitalk_js }}', () => {
     var gitalk = new Gitalk({
       clientID    : '{{ theme.gitalk.client_id }}',
@@ -18,7 +18,7 @@ NexT.utils.loadComments('#gitalk-container', () => {
       {%- endif %}
       distractionFreeMode: {{ theme.gitalk.distraction_free_mode }}
     });
-    gitalk.render('gitalk-container');
+    gitalk.render(document.querySelector('.gitalk-container'));
   }, window.Gitalk);
 });
 </script>
diff --git a/layout/_third-party/comments/utterances.njk b/layout/_third-party/comments/utterances.njk
index 85625af..262cb4f 100644
--- a/layout/_third-party/comments/utterances.njk
+++ b/layout/_third-party/comments/utterances.njk
@@ -1,6 +1,6 @@
 {%- if page.comments %}
 <script>
-NexT.utils.loadComments('#utterances-container', () => {
+NexT.utils.loadComments('.utterances-container', () => {
   const script = document.createElement('script');
   script.src = 'https://utteranc.es/client.js';
   script.setAttribute('repo', {{ theme.utterances.repo | safedump }});
@@ -8,7 +8,7 @@ NexT.utils.loadComments('#utterances-container', () => {
   script.setAttribute('theme', {{ theme.utterances.theme | safedump }});
   script.crossOrigin = 'anonymous';
   script.async = true;
-  document.querySelector('#utterances-container').appendChild(script);
+  document.querySelector('.utterances-container').appendChild(script);
 });
 </script>
 {%- endif %}
diff --git a/scripts/filters/comment/changyan.js b/scripts/filters/comment/changyan.js
index 71e4251..a9792a0 100644
--- a/scripts/filters/comment/changyan.js
+++ b/scripts/filters/comment/changyan.js
@@ -10,11 +10,7 @@ hexo.extend.filter.register('theme_inject', injects => {
   const config = hexo.theme.config.changyan;
   if (!config.enable || !config.appid || !config.appkey) return;
 
-  injects.comment.raw('changyan', `
-  <div class="comments">
-    <div id="SOHUCS"></div>
-  </div>
-  `, {}, {cache: true});
+  injects.comment.raw('changyan', '<div class="comments" id="SOHUCS"></div>', {}, {cache: true});
 
   injects.bodyEnd.file('changyan', path.join(hexo.theme_dir, 'layout/_third-party/comments/changyan.njk'));
 
diff --git a/scripts/filters/comment/disqus.js b/scripts/filters/comment/disqus.js
index 6621dae..cd01e56 100644
--- a/scripts/filters/comment/disqus.js
+++ b/scripts/filters/comment/disqus.js
@@ -11,10 +11,8 @@ hexo.extend.filter.register('theme_inject', injects => {
   if (!config.enable || !config.shortname) return;
 
   injects.comment.raw('disqus', `
-  <div class="comments">
-    <div id="disqus_thread">
-      <noscript>Please enable JavaScript to view the comments powered by Disqus.</noscript>
-    </div>
+  <div class="comments" id="disqus_thread">
+    <noscript>Please enable JavaScript to view the comments powered by Disqus.</noscript>
   </div>
   `, {}, {cache: true});
 
diff --git a/scripts/filters/comment/disqusjs.js b/scripts/filters/comment/disqusjs.js
index 4f55efe..1fecb6c 100644
--- a/scripts/filters/comment/disqusjs.js
+++ b/scripts/filters/comment/disqusjs.js
@@ -10,10 +10,8 @@ hexo.extend.filter.register('theme_inject', injects => {
   if (!config.enable || !config.shortname || !config.apikey) return;
 
   injects.comment.raw('disqusjs', `
-  <div class="comments">
-    <div id="disqus_thread">
-      <noscript>Please enable JavaScript to view the comments powered by Disqus.</noscript>
-    </div>
+  <div class="comments" id="disqus_thread">
+    <noscript>Please enable JavaScript to view the comments powered by Disqus.</noscript>
   </div>
   `, {}, {cache: true});
 
diff --git a/scripts/filters/comment/gitalk.js b/scripts/filters/comment/gitalk.js
index df5ebb8..a68c078 100644
--- a/scripts/filters/comment/gitalk.js
+++ b/scripts/filters/comment/gitalk.js
@@ -9,7 +9,7 @@ hexo.extend.filter.register('theme_inject', injects => {
   const theme = hexo.theme.config;
   if (!theme.gitalk.enable) return;
 
-  injects.comment.raw('gitalk', '<div class="comments" id="gitalk-container"></div>', {}, {cache: true});
+  injects.comment.raw('gitalk', '<div class="comments gitalk-container"></div>', {}, {cache: true});
 
   injects.bodyEnd.file('gitalk', path.join(hexo.theme_dir, 'layout/_third-party/comments/gitalk.njk'));
 
diff --git a/scripts/filters/comment/isso.js b/scripts/filters/comment/isso.js
index ce6822c..10876fb 100644
--- a/scripts/filters/comment/isso.js
+++ b/scripts/filters/comment/isso.js
@@ -9,11 +9,7 @@ hexo.extend.filter.register('theme_inject', injects => {
   const theme = hexo.theme.config;
   if (!theme.isso) return;
 
-  injects.comment.raw('isso', `
-  <div class="comments">
-    <div id="isso-thread"></div>
-  </div>
-  `, {}, { cache: true });
+  injects.comment.raw('isso', '<div class="comments" id="isso-thread"></div>', {}, { cache: true });
 
   injects.bodyEnd.file('isso', path.join(hexo.theme_dir, 'layout/_third-party/comments/isso.njk'));
 
diff --git a/scripts/filters/comment/livere.js b/scripts/filters/comment/livere.js
index 4832f65..9cab5c6 100644
--- a/scripts/filters/comment/livere.js
+++ b/scripts/filters/comment/livere.js
@@ -9,11 +9,7 @@ hexo.extend.filter.register('theme_inject', injects => {
   const theme = hexo.theme.config;
   if (!theme.livere_uid) return;
 
-  injects.comment.raw('livere', `
-  <div class="comments">
-    <div id="lv-container" data-id="city" data-uid="{{ theme.livere_uid }}"></div>
-  </div>
-  `, {}, {cache: true});
+  injects.comment.raw('livere', '<div class="comments" id="lv-container" data-id="city" data-uid="{{ theme.livere_uid }}"></div>', {}, {cache: true});
 
   injects.bodyEnd.file('livere', path.join(hexo.theme_dir, 'layout/_third-party/comments/livere.njk'));
 
diff --git a/scripts/filters/comment/utterances.js b/scripts/filters/comment/utterances.js
index aac06f7..398a60a 100644
--- a/scripts/filters/comment/utterances.js
+++ b/scripts/filters/comment/utterances.js
@@ -14,11 +14,7 @@ hexo.extend.filter.register('theme_inject', injects => {
     return;
   }
 
-  injects.comment.raw('utterances', `
-  <div class="comments">
-    <div id="utterances-container"></div>
-  </div>
-  `, {}, { cache: true });
+  injects.comment.raw('utterances', '<div class="comments utterances-container"></div>', {}, { cache: true });
 
   injects.bodyEnd.file('utterances', path.join(hexo.theme_dir, 'layout/_third-party/comments/utterances.njk'));
 
diff --git a/source/js/algolia-search.js b/source/js/algolia-search.js
index a8304d4..d6adab4 100644
--- a/source/js/algolia-search.js
+++ b/source/js/algolia-search.js
@@ -67,7 +67,7 @@ document.addEventListener('DOMContentLoaded', () => {
           return result;
         },
         empty: data => {
-          return `<div id="algolia-hits-empty">
+          return `<div class="algolia-hits-empty">
               ${CONFIG.i18n.empty.replace(/\$\{query}/, data.query)}
             </div>`;
         }