1. fix bugs of gitalk #9

2. fix bugs of valine

layout/includes/comments/disqus.pug

@@ -11,5 +11,3 @@ if theme.disqus.enable
     s.src = "https://" + '!{theme.disqus.shortname}' +".disqus.com/embed.js";
     s.setAttribute('data-timestamp', '' + +new Date());
     (d.head || d.body).appendChild(s);
-  if theme.disqus.count
-    script#dsq-count-scr(src="https://" + theme.disqus.shortname + ".disqus.com/count.js" async)

layout/includes/comments/gitalk.pug

@@ -1,13 +1,13 @@
-if theme.gitment && theme.gitment.enable
+if theme.gitalk && theme.gitalk.enable
-  #gitment-container
+  #gitalk-container
   script.
-    var gitment = new Gitment({
+    var gitalk = new Gitalk({
+      clientID: '!{theme.gitalk.client_id}',
+      clientSecret: '!{theme.gitalk.client_secret}',
+      repo: '!{theme.gitalk.repo}',
+      owner: '!{theme.gitalk.owner}',
+      admin: '!{theme.gitalk.admin}',
       id: md5(decodeURI(location.pathname)),
-      owner: '!{theme.gitment.owner}',
+      language: '!{lang}'
-      repo: '!{theme.gitment.repo}',
-      oauth: {
-        client_id: '!{theme.gitment.client_id}',
-        client_secret: '!{theme.gitment.client_secret}'
-      }
     })
-    gitment.render('gitment-container')
+    gitalk.render('gitalk-container')

layout/includes/comments/gitment.pug

@@ -2,6 +2,7 @@ if theme.gitment && theme.gitment.enable
   #gitment-container
   script.
     var gitment = new Gitment({
+      id: md5(decodeURI(location.pathname)),
       owner: '!{theme.gitment.owner}',
       repo: '!{theme.gitment.repo}',
       oauth: {