⬆ vditor

package-lock.json

@@ -1165,9 +1165,9 @@
       "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
     },
     "acorn-globals": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.2.tgz",
-      "integrity": "sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz",
+      "integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==",
       "requires": {
         "acorn": "^6.0.1",
         "acorn-walk": "^6.0.1"
@@ -1469,9 +1469,9 @@
       "dev": true
     },
     "async-limiter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
-      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="
     },
     "async-settle": {
       "version": "1.0.0",
@@ -1772,9 +1772,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000988",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000988.tgz",
-      "integrity": "sha512-lPj3T8poYrRc/bniW5SQPND3GRtSrQdUM/R4mCYTbZxyi3jQiggLvZH4+BYUuX0t4TXjU+vMM7KFDQg+rSzZUQ=="
+      "version": "1.0.30000989",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz",
+      "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw=="
     },
     "caseless": {
       "version": "0.12.0",
@@ -2208,9 +2208,9 @@
       "integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="
     },
     "d3-brush": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.6.tgz",
-      "integrity": "sha512-lGSiF5SoSqO5/mYGD5FAeGKKS62JdA1EV7HPrU2b5rTX4qEJJtpjaGLJngjnkewQy7UnGstnFd3168wpf5z76w==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.1.tgz",
+      "integrity": "sha512-nVIsduqChMBemov7NvTj3imYvDcihqf73RzoLULW0FrDmIlaWuP8Q9P+rPQB5SpqQjbrr4m0DoaHQewVcPhZsQ==",
       "requires": {
         "d3-dispatch": "1",
         "d3-drag": "1",
@@ -2234,9 +2234,9 @@
       "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
     },
     "d3-color": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.2.8.tgz",
-      "integrity": "sha512-yeANXzP37PHk0DbSTMNPhnJD+Nn4G//O5E825bR6fAfHH43hobSBpgB9G9oWVl9+XgUaQ4yCnsX1H+l8DoaL9A=="
+      "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=="
     },
     "d3-contour": {
       "version": "1.3.2",
@@ -2321,9 +2321,9 @@
       }
     },
     "d3-path": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.7.tgz",
-      "integrity": "sha512-q0cW1RpvA5c5ma2rch62mX8AYaiLX0+bdaSM2wxSU9tXjU4DNvkx9qiUvjkuWCj3p22UO/hlPivujqMiR9PDzA=="
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.8.tgz",
+      "integrity": "sha512-J6EfUNwcMQ+aM5YPOB8ZbgAZu6wc82f/0WFxrxwV6Ll8wBwLaHLKCqQ5Imub02JriCVVdPjgI+6P3a4EWJCxAg=="
     },
     "d3-polygon": {
       "version": "1.0.5",
@@ -2652,9 +2652,9 @@
       }
     },
     "documentation": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/documentation/-/documentation-12.1.0.tgz",
-      "integrity": "sha512-iAllbFhy1P5DvKAcrPw0h5R5rNMnaXAjExj3XKUzW/eBvQ6JhTbDELQnN8k3SrBvQAnm70+6NLsmxA+csp4f/Q==",
+      "version": "12.1.1",
+      "resolved": "https://registry.npmjs.org/documentation/-/documentation-12.1.1.tgz",
+      "integrity": "sha512-OmvNJ6gddKy9K8lx+eA9w+dTxs//vetBnzhaGrTnXbKkE1qgAP0DXaEE8pva2ptSDw3Wa6oDm3C7fKgXdobjPQ==",
       "requires": {
         "@babel/core": "^7.1.2",
         "@babel/generator": "^7.1.3",
@@ -2953,9 +2953,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.209",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.209.tgz",
-      "integrity": "sha512-KxRvLp5jUapyKIcMaecwgmUpJEsJKuHn0DJJPZjZh2valqYlzdmGvaE/nTAqwKqQwf0jIKv7Go4FYHu9wKWzOg=="
+      "version": "1.3.215",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.215.tgz",
+      "integrity": "sha512-ZV3OnwF0FlIygwxAG2H92yt7WGjWBpawyFAFu8e9k7xJatY+BPowID0D0Bs3PMACYAJATEejw/I9cawO27ZvTg=="
     },
     "emoji-regex": {
       "version": "6.1.1",
@@ -7412,9 +7412,9 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "terser": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.2.tgz",
-      "integrity": "sha512-jvNoEQSPXJdssFwqPSgWjsOrb+ELoE+ILpHPKXC83tIxOlh2U75F1KuB2luLD/3a6/7K3Vw5pDn+hvu0C4AzSw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.3.tgz",
+      "integrity": "sha512-on13d+cnpn5bMouZu+J8tPYQecsdRJCJuxFJ+FVoPBoLJgk5bCBkp+Uen2hWyi0KIUm6eDarnlAlH+KgIx/PuQ==",
       "requires": {
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
@@ -7968,9 +7968,9 @@
       "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM="
     },
     "vditor": {
-      "version": "1.6.11",
-      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.6.11.tgz",
-      "integrity": "sha512-hJpkyGR4xSyD8k/lM3mVofFLszTCv+3qVdvgQ0tpx3no3mOGFH876lF/t6+Xo/VYkjQrHII50AmbsqtykQe2XA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.7.0.tgz",
+      "integrity": "sha512-KHYh2dtnNFGAnq/vRYZpuaAIqABdu6vPPaIt/JiE8ckBUqrf+5D9fCiqIg7DJ9jTnQEc7OP5rMqfEOMqjFE1iA==",
       "requires": {
         "echarts": "^4.2.1",
         "highlight.js": "^9.15.8",

package.json

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

src/main/webapp/js/admin/article.js

@@ -20,7 +20,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.6.0.4, Mar 4, 2019
+ * @version 1.6.0.5, Aug 6, 2019
  */
 admin.article = {
   // 当发文章，取消发布，更新文章时设置为 false。不需在离开编辑器时进行提示。
@@ -417,14 +417,14 @@ admin.article = {
       id: 'articleContent',
       height: 500,
       fun: fun,
-      previewShow: true,
+      previewMode: 'both',
       resize: false,
     })
 
     admin.editors.abstractEditor = new SoloEditor({
       id: 'abstract',
       height: 200,
-      previewShow: false,
+      previewMode: 'editor',
       resize: true,
     })
 

src/main/webapp/js/admin/editor.js

@@ -19,7 +19,7 @@
  * @fileoverview editor
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
- * @version 1.3.0.0, Jun 1, 2019
+ * @version 1.3.0.1, Aug 6, 2019
  */
 
 admin.editors = {}
@@ -49,7 +49,7 @@ $.extend(SoloEditor.prototype, {
       },
       preview: {
         delay: 500,
-        show: this.conf.previewShow,
+        mode: this.conf.previewMode,
         url: Label.servePath + '/console/markdown/2html',
         parse: function(element) {
           if (element.style.display === 'none') {

src/main/webapp/js/page.js

@@ -20,7 +20,7 @@
  *
  * @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 2.4.0.0, Jul 11, 2019
+ * @version 2.4.0.1, Aug 6, 2019
  */
 var Page = function (tips) {
   this.currentCommentId = ''
@@ -128,6 +128,7 @@ $.extend(Page.prototype, {
         'link',
         'table',
         '|',
+        'both',
         'preview',
         'fullscreen',
         'info',
@@ -164,7 +165,7 @@ $.extend(Page.prototype, {
         },
         preview: {
           delay: 500,
-          show: false,
+          mode: 'editor',
           url: Label.servePath + '/console/markdown/2html',
           hljs: {
             enable: true,

skins @ 609fd087

-Subproject commit 1960541a7ede6ab4304a1030fb17f756ae90f227
+Subproject commit 609fd087e2ec75a0e29c2e2fce8da230f44b5b13