Move Disqus script inside conditional to avoid <noscript> text from a…

…ppearing on pages that have comments disabled
mmistakes · Jan 22, 2015 · 7956577 · 7956577
1 parent c25fad7
commit 7956577
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/_config.yml b/_config.yml
@@ -7,7 +7,6 @@ logo: site-logo.png
 search: true
 url: http://localhost:4000
 
-
 # Jekyll configuration
 
 permalink:   /:categories/:title/
@@ -50,4 +49,4 @@ owner:
     verify:
     ad-client:
     ad-slot: 
-  bing-verify:
+  bing-verify:
diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -23,7 +23,3 @@
   })();
 </script>
 {% endif %}
-
-{% if page.comments or site.comments %}
-  {% include disqus_comments.html %}
-{% endif %}
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -41,7 +41,10 @@ <h1 class="entry-title">{% if page.headline %}{{ page.headline }}{% else %}{{ pa
       </footer>
       <div class="entry-content">
         {{ content }}
-        {% if (site.owner.disqus-shortname and page.comments) or site.comments %}<div id="disqus_thread"></div><!-- /#disqus_thread -->{% endif %}
+        {% if (site.owner.disqus-shortname and page.comments) or site.comments %}
+          <div id="disqus_thread"></div><!-- /#disqus_thread -->
+          {% include disqus_comments.html %}
+        {% endif %}
       </div><!-- /.entry-content -->
     </div><!-- /.entry-wrapper -->
     <nav class="pagination" role="navigation">