From 987c3e349ea328373157e5c249c64142be521bba Mon Sep 17 00:00:00 2001
From: yscoder <634206017@qq.com>
Date: Mon, 20 Nov 2017 02:34:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=B8=8D=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=20Valine,=20v1.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout/_partial/plugins/valine.ejs | 23 ++++++++++++++++++++++-
 layout/_partial/script.ejs         | 27 ---------------------------
 package.json                       |  2 +-
 3 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/layout/_partial/plugins/valine.ejs b/layout/_partial/plugins/valine.ejs
index b3f6f606..133eeaf5 100644
--- a/layout/_partial/plugins/valine.ejs
+++ b/layout/_partial/plugins/valine.ejs
@@ -1,4 +1,25 @@
 <% if (theme.valine.enable ){ %>
+    <!-- Valine Comments -->
     <div class="comments vcomment" id="comments"></div>
+    <script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>
+    <script src="//unpkg.com/valine@latest/dist/Valine.min.js"></script>
+    <!-- Valine Comments script -->
+    <script>
+        var GUEST_INFO = ['nick','mail','link'];
+        var guest_info = '<%= theme.valine.guest_info %>'.split(',').filter(function(item){
+          return GUEST_INFO.indexOf(item) > -1
+        });
+        new Valine({
+            el: '#comments',
+            notify: '<%= theme.valine.notify %>' == 'true',
+            verify: '<%= theme.valine.verify %>' == 'true',
+            appId: "<%= theme.valine.appId %>",
+            appKey: "<%= theme.valine.appKey %>",
+            avatar: "<%= theme.valine.avatar %>",
+            placeholder: "<%= theme.valine.placeholder %>",
+            guest_info: guest_info.length == 0 ? GUEST_INFO : guest_info,
+            pageSize: "<%= theme.valine.pageSize %>"
+        })
+    </script>
+    <!-- Valine Comments end -->
 <% } %>
-    
\ No newline at end of file
diff --git a/layout/_partial/script.ejs b/layout/_partial/script.ejs
index aaef68e9..1299d576 100644
--- a/layout/_partial/script.ejs
+++ b/layout/_partial/script.ejs
@@ -20,30 +20,3 @@ lazyScripts.push('//s95.cnzz.com/z_stat.php?id=<%-theme.cnzz %>&web_id=<%-theme.
 <% } %>
 
 <%- partial('plugins/dynamic-title') %>
-
-
-<!-- Valine Comments -->
-<% if (theme.valine.enable){ %>
-    <script src="//cdn1.lncld.net/static/js/3.0.4/av-min.js"></script>
-    <script src="//unpkg.com/valine@latest/dist/Valine.min.js"></script>
-    <script type="text/javascript">
-        var notify = '<%= theme.valine.notify %>' == true ? true : false;
-        var verify = '<%= theme.valine.verify %>' == true ? true : false;
-        var GUEST_INFO = ['nick','mail','link'];
-        var guest_info = '<%= theme.valine.guest_info %>'.split(',').filter(function(item){
-          return GUEST_INFO.indexOf(item) > -1
-        });
-        guest_info = guest_info.length == 0 ? GUEST_INFO :guest_info;
-        new Valine({
-            el: '.vcomment',
-            notify: notify,
-            verify: verify,
-            appId: "<%= theme.valine.appId %>",
-            appKey: "<%= theme.valine.appKey %>",
-            avatar:"<%= theme.valine.avatar %>",
-            placeholder: "<%= theme.valine.placeholder %>",
-            guest_info:guest_info,
-            pageSize:"<%= theme.valine.pageSize %>"
-        })
-    </script>
-    <% } %>
diff --git a/package.json b/package.json
index 46c9ab23..55203aad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-material-indigo",
-  "version": "1.6.17",
+  "version": "1.7.0",
   "description": "Material Design theme for Hexo.",
   "keywords": [
     "hexo",