Merge branch '3.6.0-dev' into 3.6.1-dev

package.json

@@ -36,6 +36,6 @@
     "gulp-uglify": "^3.0.1"
   },
   "dependencies": {
-    "vditor": "^1.2.10"
+    "vditor": "^1.3.0"
   }
 }

src/main/webapp/admin/admin-index.ftl

@@ -165,7 +165,7 @@
             </div>
         </div>
         <script src="${staticServePath}/js/lib/compress/admin-lib.min.js"></script>
-        <script src="https://cdn.jsdelivr.net/npm/vditor@1.2.10/dist/index.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/vditor@1.3.0/dist/index.min.js"></script>
         <script src="${staticServePath}/js/common${miniPostfix}.js"></script>
         <#if "" == miniPostfix>
         <script src="${staticServePath}/js/admin/admin.js"></script>

src/main/webapp/js/common.js

@@ -158,7 +158,7 @@ var Util = {
     if (!Label.markedAvailable) {
       if (typeof hljs === 'undefined') {
         $.ajax({
-          url: 'https://cdn.jsdelivr.net/npm/vditor@1.2.10/src/assets/js/highlight.pack.js',
+          url: 'https://cdn.jsdelivr.net/npm/vditor@1.3.0/src/assets/js/highlight.pack.js',
           dataType: 'script',
           cache: true,
           success: function () {
@@ -182,7 +182,7 @@ var Util = {
       return
     }
 
-    Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.2.10/dist/index.min.js',
+    Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.3.0/dist/index.min.js',
       'vditorScript')
 
     Vditor.mermaidRender(document.body)

src/main/webapp/js/page.js

@@ -113,7 +113,7 @@ $.extend(Page.prototype, {
 
     if (!$('#soloEditorComment').hasClass('vditor')) {
       var that = this
-      Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.2.10/dist/index.min.js', 'vditorScript')
+      Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.3.0/dist/index.min.js', 'vditorScript')
       window.vditor = new Vditor('soloEditorComment', {
         placeholder: that.tips.commentContentCannotEmptyLabel,
         height: 180,