async https://github.com/b3log/vditor/issues/141

package-lock.json

@@ -65,9 +65,9 @@
       "dev": true
     },
     "abab": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.1.tgz",
-      "integrity": "sha512-1zSbbCuoIjafKZ3mblY5ikvAb0ODUbqBnFuUb7f6uLeQhhGJ0vEV4ntmtxKLT2WgXCO94E07BjunsIw1jOMPZw=="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.2.tgz",
+      "integrity": "sha512-2scffjvioEmNz0OyDSLGWDfKCVwaKc6l9Pm9kOIREU13ClXZvHpg/nRL5xyjSSSLhOnXqft2HpsAzNEEA8cFFg=="
     },
     "abbrev": {
       "version": "1.1.1",
@@ -1055,9 +1055,9 @@
       "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
     },
     "d3-color": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.3.0.tgz",
-      "integrity": "sha512-NHODMBlj59xPAwl2BDiO2Mog6V+PrGRtBfWKqKRrs9MCqlSkIEb0Z/SfY7jW29ReHTDC/j+vwXhnZcXI3+3fbg=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.0.tgz",
+      "integrity": "sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg=="
     },
     "d3-contour": {
       "version": "1.3.2",
@@ -1197,9 +1197,9 @@
       }
     },
     "d3-time": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.11.tgz",
-      "integrity": "sha512-Z3wpvhPLW4vEScGeIMUckDW7+3hWKOQfAWg/U7PlWBnQmeKQ00gCUsTtWSYulrKNA7ta8hJ+xXc6MHrMuITwEw=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
+      "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
     },
     "d3-time-format": {
       "version": "2.1.3",
@@ -5340,9 +5340,9 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "terser": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.1.tgz",
-      "integrity": "sha512-pnzH6dnFEsR2aa2SJaKb1uSCl3QmIsJ8dEkj0Fky+2AwMMcC9doMqLOQIH6wVTEKaVfKVvLSk5qxPBEZT9mywg==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.3.tgz",
+      "integrity": "sha512-Nzr7dpRjSzMEUS+z2UYQBtzE0LDm5k0Yy8RgLRPy85QUo1TjU5lIOBwzS5/FVAMaVyHZ3WTTU2BuQcMn8KXnNQ==",
       "requires": {
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
@@ -5749,9 +5749,9 @@
       "dev": true
     },
     "vditor": {
-      "version": "1.8.11",
-      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.8.11.tgz",
-      "integrity": "sha512-BVu8juWk6v1AMb+74rPsTxSLq3jT3pkNJQ2VuAMS6cifhslWdmJpbkdFVV2drXrSLwRCMCoUH+9aq9+IGskNGQ==",
+      "version": "1.8.13",
+      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.8.13.tgz",
+      "integrity": "sha512-opowrsbyvyyNNuugUl2ImvPjYehn4FwM5M6FBEfc9AitU2UVd7ZHsE5VJMJ1LiZ05uDL5eG2i7hftwmwMrfyDQ==",
       "requires": {
         "abcjs": "^5.8.0",
         "diff-match-patch": "^1.0.4",

package.json

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

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

@@ -165,7 +165,7 @@ var Util = {
 
     if (typeof Vditor === 'undefined') {
       Util.addScript(
-        'https://cdn.jsdelivr.net/npm/vditor@1.8.11/dist/method.min.js',
+        'https://cdn.jsdelivr.net/npm/vditor@1.8.13/dist/method.min.js',
         'vditorPreviewScript')
     }
 
@@ -178,11 +178,7 @@ var Util = {
 
     Vditor.abcRender()
     Vditor.chartRender()
-    // TODO vditor@1.8.12 后移除判断
-    var vditorResetElement = document.querySelector('.vditor-reset')
-    if (vditorResetElement) {
-      Vditor.mediaRender(vditorResetElement)
-    }
+    Vditor.mediaRender(document.body)
     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.8.11/dist/index.min.js',
+        'https://cdn.jsdelivr.net/npm/vditor@1.8.13/dist/index.min.js',
         'vditorScript')
       var toolbar = [
         'emoji',

skins @ 114cfeb3

-Subproject commit b661ebc480f50a680c0c70042d33faf707f0d88f
+Subproject commit 114cfeb3163b61dcd3b5cd07e0d59a22b6d3fdb6