From dc2c70ecec5e1495b668e520188f17773ee959bb Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Sat, 27 Jul 2019 21:19:27 +0100
Subject: [PATCH] fix: just include Disqus comment count JS once if enabled

Fix #1229
Fix a1ba678e793edc2992f2202f228c9e3449ce3784
---
 layouts/partials/page_metadata.html | 1 -
 layouts/partials/site_js.html       | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/layouts/partials/page_metadata.html b/layouts/partials/page_metadata.html
index 0577e6f6..6d8be540 100644
--- a/layouts/partials/page_metadata.html
+++ b/layouts/partials/page_metadata.html
@@ -54,7 +54,6 @@
   {{ if and $disqus_enabled (site.Params.comments.disqus.show_count | default true) }}
   <span class="middot-divider"></span>
   <a href="{{ $page.RelPermalink }}#disqus_thread"><!-- Count will be inserted here --></a>
-  <script id="dsq-count-scr" src="https://{{site.Params.comments.disqus.shortname}}.disqus.com/count.js" async></script>
   {{ end}}
 
   {{ $taxonomy := "categories" }}
diff --git a/layouts/partials/site_js.html b/layouts/partials/site_js.html
index 561b00a9..f4a227dc 100644
--- a/layouts/partials/site_js.html
+++ b/layouts/partials/site_js.html
@@ -124,6 +124,12 @@
     </script>
     {{ end }}
 
+    {{/* Disqus Comment Count JS. */}}
+    {{ $disqus_enabled := eq site.Params.comments.engine 1 | and (index site.Params.comments.commentable .Type) | and (ne .Params.commentable false) | or .Params.commentable }}
+    {{ if and $disqus_enabled (site.Params.comments.disqus.show_count | default true) }}
+    <script id="dsq-count-scr" src="https://{{site.Params.comments.disqus.shortname}}.disqus.com/count.js" async></script>
+    {{ end }}
+
     {{ $js_comment := printf "/* Source Themes Academic v%s | https://sourcethemes.com/academic/ */\n" site.Data.academic.version }}
     {{ $js_bundle_head := $js_comment | resources.FromString "js/bundle-head.js" }}
     {{ $js_linebreak := "\n" | resources.FromString "js/linebreak.js" }}{{/* Fix no line break after Bootstrap JS causing error. */}}