⬆ vditor

package-lock.json

@@ -1159,6 +1159,14 @@
       "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
       "dev": true
     },
+    "abcjs": {
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/abcjs/-/abcjs-5.8.0.tgz",
+      "integrity": "sha512-gRU69oZ7ZhETE6TKUqb462tkoDuzLGrtD7d95XguF650GGFlcu4hw91NMwo8Km4007W6tpFPVpLxkAum1pr0/g==",
+      "requires": {
+        "midi": "git+https://github.com/paulrosen/MIDI.js.git#abcjs"
+      }
+    },
     "acorn": {
       "version": "5.7.3",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
@@ -2952,9 +2960,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.225",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.225.tgz",
-      "integrity": "sha512-7W/L3jw7HYE+tUPbcVOGBmnSrlUmyZ/Uyg24QS7Vx0a9KodtNrN0r0Q/LyGHrcYMtw2rv7E49F/vTXwlV/fuaA=="
+      "version": "1.3.234",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.234.tgz",
+      "integrity": "sha512-SVXY503NJLFAqBx8VdJaO47G+qUQggHgRjZnyjH9/SZ1w0CJpeBrEssNPk71TeKU8OGHdYjjNNHeJ6v+TJoCBg=="
     },
     "emoji-regex": {
       "version": "6.1.1",
@@ -3086,9 +3094,9 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "estraverse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
-      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
     },
     "esutils": {
       "version": "2.0.3",
@@ -3619,6 +3627,7 @@
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3635,6 +3644,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3718,6 +3728,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3793,7 +3804,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3880,11 +3892,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -5443,6 +5457,10 @@
         "to-regex": "^3.0.2"
       }
     },
+    "midi": {
+      "version": "git+https://github.com/paulrosen/MIDI.js.git#e593ffef81a0350f99448e3ab8111957145ff6b2",
+      "from": "git+https://github.com/paulrosen/MIDI.js.git#abcjs"
+    },
     "mime": {
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
@@ -7961,10 +7979,11 @@
       "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM="
     },
     "vditor": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.7.7.tgz",
-      "integrity": "sha512-MGwIaCjEbOAlxT+ajSmx1mt2bikZYhLMtAi6OxVgV7zd+NKOz2kJ/qA45zrFvOfaQOamXUVkadF4ild6eKZGRg==",
+      "version": "1.7.9",
+      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.7.9.tgz",
+      "integrity": "sha512-MXhyF5yQKyuAcYwBc9mdaFP+UZghKFhjE4z7SMNFYlcKX2ZbtIIiWlWokX/ZxaVRGTRt0p772Y1VQj0ojXe/Tw==",
       "requires": {
+        "abcjs": "^5.8.0",
         "diff-match-patch": "^1.0.4",
         "echarts": "^4.2.1",
         "highlight.js": "^9.15.9",

package.json

@@ -36,6 +36,6 @@
     "gulp-uglify": "^3.0.2"
   },
   "dependencies": {
-    "vditor": "^1.7.7"
+    "vditor": "^1.7.9"
   }
 }

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.7.7/dist/index.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/vditor@1.7.9/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

@@ -182,7 +182,7 @@ var Util = {
       return
     }
 
-    Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.7.7/dist/index.min.js',
+    Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.7.9/dist/index.min.js',
       'vditorScript')
 
     Vditor.mermaidRender(document.body)

src/main/webapp/js/page.js

@@ -103,7 +103,7 @@ $.extend(Page.prototype, {
     if (!$('#soloEditorComment').hasClass('vditor')) {
       var that = this
       Util.addScript(
-        'https://cdn.jsdelivr.net/npm/vditor@1.7.7/dist/index.min.js',
+        'https://cdn.jsdelivr.net/npm/vditor@1.7.9/dist/index.min.js',
         'vditorScript')
       var toolbar = [
         'emoji',