support more markdown syntax

DesertsP · Feb 25, 2019 · 5829c8a · 5829c8a
1 parent 4d794c7
commit 5829c8a
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 29 deletions.
diff --git a/dist/Valine.min.js b/dist/Valine.min.js
diff --git a/dist/Valine.min.js.map b/dist/Valine.min.js.map
diff --git a/package.json b/package.json
@@ -40,7 +40,6 @@
         "css-loader": "^0.28.4",
         "exports-loader": "^0.6.4",
         "file-loader": "^0.11.2",
-        "marked": "^0.3.19",
         "node-sass": "^4.5.3",
         "postcss-loader": "^2.0.6",
         "sass-loader": "^6.0.6",
@@ -52,6 +51,7 @@
     "dependencies": {
         "babel": "^6.23.0",
         "blueimp-md5": "^2.8.0",
+        "markdown-it": "^8.4.2",
         "source-map": "^0.5.6"
     }
 }
diff --git a/src/Valine.js b/src/Valine.js
@@ -1,5 +1,5 @@
 require('./Valine.scss');
-import marked from 'marked';
+var md = require('markdown-it')();
 
 var crypto = require('blueimp-md5');
 
@@ -389,7 +389,7 @@ class Valine {
                 }
             }
             defaultComment['rid'] = '';
-            defaultComment['nick'] = '小可爱';
+            defaultComment['nick'] = '访客';
             getCache();
         }
 
@@ -409,11 +409,12 @@ class Valine {
                 return;
             }
             if (defaultComment.nick == '') {
-                defaultComment['nick'] = '小调皮';
+                defaultComment['nick'] = '访客';
             }
             // replace smiles
             defaultComment.comment = defaultComment.comment.replace(/!\(:(.*?\.\w+):\)/g, `![](${option.emoticon_url}/$1)`);
-            defaultComment.comment = marked(defaultComment.comment);
+            // render markdown
+            defaultComment.comment = md.render(HtmlUtil.decode(defaultComment.comment));
             let idx = defaultComment.comment.indexOf(defaultComment.at);
             if (idx > -1 && defaultComment.at != '') {
                 let at = `<a class="at" href='#${defaultComment.rid}'>${defaultComment.at}</a>`;
@@ -426,27 +427,21 @@ class Valine {
             defaultComment['link'] = linkRet.k ? linkRet.v : '';
             if (!mailRet.k && !linkRet.k) {
                 _root.alert.show({
-                    type: 1,
-                    text: '您的网址和邮箱格式不正确, 将导致无法正确显示头像和接收回复通知邮件。是否继续提交?',
-                    cb() {
-                        commitEvt()
-                    }
+                    type: 0,
+                    text: '您的网址和邮箱格式不正确，请修正后提交！',
+                    ctxt: '返回修改'
                 })
             } else if (!mailRet.k) {
                 _root.alert.show({
-                    type: 1,
-                    text: '您的邮箱格式不正确, 将导致无法正确显示头像和接收回复通知邮件。是否继续提交?',
-                    cb() {
-                        commitEvt();
-                    }
+                    type: 0,
+                    text: '请认真评论并填写正确的邮箱地址！<br>已开启<a href="https://deserts.io/diy-a-comment-system/" target="_blank">隐私防护</a>不会泄露您的个人信息，<a href="https://akismet.com/privacy/" target="_blank">了解反垃圾系统如何处理您的数据。</a>',
+                    ctxt: '返回修改'
                 })
             } else if (!linkRet.k) {
                 _root.alert.show({
-                    type: 1,
-                    text: '您的网址格式不正确, 是否继续提交?',
-                    cb() {
-                        commitEvt();
-                    }
+                    type: 0,
+                    text: '您的网址格式不正确，请修正后提交！',
+                    ctxt: '返回修改'
                 })
             } else {
                 commitEvt();

diff --git a/src/Valine.scss b/src/Valine.scss
@@ -7,8 +7,6 @@
     line-height: 1.42857143;
     color: #3c484e;
     transition: all .3s ease;
-    margin: 0;
-    padding: 0;
   }
   .vwrap {
     overflow: hidden;
@@ -181,7 +179,7 @@
       left: 0;
       top: 0;
       .valert {
-        padding: 3em 0 0 0;
+        padding: 2em 0 0 0;
         .vtext {
           color: #fff;
           padding: 15px;
@@ -235,10 +233,6 @@
       // color: #3eb0ef;
     }
   }
-  ul,
-  li {
-    list-style: none;
-  }
   .txt-center {
     text-align: center;
   }
@@ -294,6 +288,9 @@
     // border-top: 1px solid #dedede;
     // border-bottom: 1px solid #dedede;
     width: 100%;
+    list-style: none;
+    margin: 0;
+    padding: 0;
     .vcard {
       display: flex;
       display: -ms-flexbox;
@@ -372,6 +369,11 @@
 
         .vcomment {
           position: relative;
+          blockquote {
+            p {
+              padding-left: 12px;
+            }
+          }
           p {
             word-wrap: break-word;
             white-space: pre-wrap;