Skip to content

S
solo-1
Commit 8586355c authored by Van's avatar Van
Browse files
Options

⬆ vditor

parent bf7deb6b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 46 deletions
package-lock.json
View file @ 8586355c
...@@ -2087,13 +2087,12 @@ ...@@ -2087,13 +2087,12 @@
} }
}, },
"core-js-compat": { "core-js-compat": {
"version": "3.1.4", "version": "3.2.0",
"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.4.tgz", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.0.tgz",
"integrity": "sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==", "integrity": "sha512-vQve8j3tGPPqIkrsK442hbVwDIGXcngLPnislJaCNJIG1aBWPD0IqRhpxEwjtUOYpzLap8xA7CoGlJBT1ZkcDA==",
"requires": { "requires": {
"browserslist": "^4.6.2", "browserslist": "^4.6.6",
"core-js-pure": "3.1.4", "semver": "^6.3.0"
"semver": "^6.1.1"
}, },
"dependencies": { "dependencies": {
"semver": { "semver": {
...@@ -2103,11 +2102,6 @@ ...@@ -2103,11 +2102,6 @@
} }
} }
}, },
"core-js-pure": {
"version": "3.1.4",
"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.4.tgz",
"integrity": "sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA=="
},
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
...@@ -2354,9 +2348,9 @@ ...@@ -2354,9 +2348,9 @@
} }
}, },
"d3-scale-chromatic": { "d3-scale-chromatic": {
"version": "1.3.3", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.3.3.tgz", "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.4.0.tgz",
"integrity": "sha512-BWTipif1CimXcYfT02LKjAyItX5gKiwxuPRgr4xM58JwlLocWbjPLI7aMEjkcoOQXMkYsmNsvv3d2yl/OKuHHw==", "integrity": "sha512-0vyEt8ZqhdgzC+IvdkJZL7fc3k7UZyJvMxR3zvU312z/HilJ0N+WSY3099jAxdfhe99ak9VhcK1ChDVVGc8Q0Q==",
"requires": { "requires": {
"d3-color": "1", "d3-color": "1",
"d3-interpolate": "1" "d3-interpolate": "1"
...@@ -2412,9 +2406,9 @@ ...@@ -2412,9 +2406,9 @@
"integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg==" "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg=="
}, },
"d3-zoom": { "d3-zoom": {
"version": "1.7.4", "version": "1.8.3",
"resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.7.4.tgz", "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz",
"integrity": "sha512-GneUZn7yxAvuJVCFb6exODeDSvydfWLj5Mc4CT/cPNwtYLrlJvxUcu4tPWrnsZzpHMepU0ST2PFokWWSft+G3w==", "integrity": "sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==",
"requires": { "requires": {
"d3-dispatch": "1", "d3-dispatch": "1",
"d3-drag": "1", "d3-drag": "1",
...@@ -2953,9 +2947,9 @@ ...@@ -2953,9 +2947,9 @@
} }
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.220", "version": "1.3.223",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.220.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.223.tgz",
"integrity": "sha512-ZsaFWi+9J9Nsm4OmGM/BvZF3HEeZL4bte1+CcN9vHUcqdkOOVAXP4SeacPZ/W5uCQZEKPYBXg6yUjZx8/jpD0Q==" "integrity": "sha512-xXFNJ+akZMtRZQYBLlGoc11lDfwj6FdWHwle/0U3vWtVaWh/MBbU25vtRCBB4lpHLmQ8Y9a6Tsb+0UONFbNXmQ=="
}, },
"emoji-regex": { "emoji-regex": {
"version": "6.1.1", "version": "6.1.1",
...@@ -5707,9 +5701,9 @@ ...@@ -5707,9 +5701,9 @@
} }
}, },
"node-releases": { "node-releases": {
"version": "1.1.26", "version": "1.1.27",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.26.tgz", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.27.tgz",
"integrity": "sha512-fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ==", "integrity": "sha512-9iXUqHKSGo6ph/tdXVbHFbhRVQln4ZDTIBJCzsa90HimnBYc5jw8RWYt4wBYFHehGyC3koIz5O4mb2fHrbPOuA==",
"requires": { "requires": {
"semver": "^5.3.0" "semver": "^5.3.0"
}, },
...@@ -6541,12 +6535,12 @@ ...@@ -6541,12 +6535,12 @@
"integrity": "sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg==" "integrity": "sha512-7/l/DgapVVDzZobwMCCgMlqiqyLFJ0cduo/j+3BcDJIB+yJdsYCfKuI3l/04NV+H/rfNRdPIDbXNZHM9XvQatg=="
}, },
"regexpu-core": { "regexpu-core": {
"version": "4.5.4", "version": "4.5.5",
"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.5.tgz",
"integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==", "integrity": "sha512-FpI67+ky9J+cDizQUJlIlNZFKual/lUkFr1AG6zOCpwZ9cLrg8UUVakyUQJD7fCDIe9Z2nwTQJNPyonatNmDFQ==",
"requires": { "requires": {
"regenerate": "^1.4.0", "regenerate": "^1.4.0",
"regenerate-unicode-properties": "^8.0.2", "regenerate-unicode-properties": "^8.1.0",
"regjsgen": "^0.5.0", "regjsgen": "^0.5.0",
"regjsparser": "^0.6.0", "regjsparser": "^0.6.0",
"unicode-match-property-ecmascript": "^1.0.4", "unicode-match-property-ecmascript": "^1.0.4",
...@@ -7412,9 +7406,9 @@ ...@@ -7412,9 +7406,9 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
}, },
"terser": { "terser": {
"version": "4.1.3", "version": "4.1.4",
"resolved": "https://registry.npmjs.org/terser/-/terser-4.1.3.tgz", "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.4.tgz",
"integrity": "sha512-on13d+cnpn5bMouZu+J8tPYQecsdRJCJuxFJ+FVoPBoLJgk5bCBkp+Uen2hWyi0KIUm6eDarnlAlH+KgIx/PuQ==", "integrity": "sha512-+ZwXJvdSwbd60jG0Illav0F06GDJF0R4ydZ21Q3wGAFKoBGyJGo34F63vzJHgvYxc1ukOtIjvwEvl9MkjzM6Pg==",
"requires": { "requires": {
"commander": "^2.20.0", "commander": "^2.20.0",
"source-map": "~0.6.1", "source-map": "~0.6.1",
...@@ -7968,9 +7962,9 @@ ...@@ -7968,9 +7962,9 @@
"integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=" "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM="
}, },
"vditor": { "vditor": {
"version": "1.7.2", "version": "1.7.3",
"resolved": "https://registry.npmjs.org/vditor/-/vditor-1.7.2.tgz", "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.7.3.tgz",
"integrity": "sha512-7I7aVJed8UEdIsqhkG2QQnuPaC2wP5EjqmxrTWPLNcnIWH0hyYmJUOnEqtiW82NEgDScJDnUBmViEbYjtQw+wQ==", "integrity": "sha512-FjV9cfdwPXr3qTynRqNI0sNAfPJMjXDpEreRA22J1sOmGdOtVliImOYXq/WtBoAVQhLA97OzR5nSS3YUlp93QQ==",
"requires": { "requires": {
"echarts": "^4.2.1", "echarts": "^4.2.1",
"highlight.js": "^9.15.9", "highlight.js": "^9.15.9",
......
package.json
View file @ 8586355c
...@@ -36,6 +36,6 @@ ...@@ -36,6 +36,6 @@
"gulp-uglify": "^3.0.2" "gulp-uglify": "^3.0.2"
}, },
"dependencies": { "dependencies": {
"vditor": "^1.7.2" "vditor": "^1.7.3"
} }
} }
src/main/webapp/admin/admin-index.ftl
View file @ 8586355c
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<div id="tabs_others"> <div id="tabs_others">
<a href="#tools/others/tag">${othersLabel}</a> <a href="#tools/others/tag">${othersLabel}</a>
</div> </div>
</li> </li>
</ul> </ul>
</li> </li>
<li> <li>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
</div> </div>
</div> </div>
<script src="${staticServePath}/js/lib/compress/admin-lib.min.js"></script> <script src="${staticServePath}/js/lib/compress/admin-lib.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vditor@1.7.2/dist/index.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/vditor@1.7.3/dist/index.min.js"></script>
<script src="${staticServePath}/js/common${miniPostfix}.js"></script> <script src="${staticServePath}/js/common${miniPostfix}.js"></script>
<#if "" == miniPostfix> <#if "" == miniPostfix>
<script src="${staticServePath}/js/admin/admin.js"></script> <script src="${staticServePath}/js/admin/admin.js"></script>
...@@ -196,4 +196,4 @@ ...@@ -196,4 +196,4 @@
admin.inited(); admin.inited();
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/webapp/js/common.js
View file @ 8586355c
...@@ -182,7 +182,7 @@ var Util = { ...@@ -182,7 +182,7 @@ var Util = {
return return
} }
Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.7.2/dist/index.min.js', Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.7.3/dist/index.min.js',
'vditorScript') 'vditorScript')
Vditor.mermaidRender(document.body) Vditor.mermaidRender(document.body)
...@@ -418,4 +418,4 @@ if (!Cookie) { ...@@ -418,4 +418,4 @@ if (!Cookie) {
'; path=/' '; path=/'
}, },
} }
} }
\ No newline at end of file
src/main/webapp/js/common.min.js
View file @ 8586355c
This diff is collapsed.
src/main/webapp/js/page.js
View file @ 8586355c
...@@ -103,7 +103,7 @@ $.extend(Page.prototype, { ...@@ -103,7 +103,7 @@ $.extend(Page.prototype, {
if (!$('#soloEditorComment').hasClass('vditor')) { if (!$('#soloEditorComment').hasClass('vditor')) {
var that = this var that = this
Util.addScript( Util.addScript(
'https://cdn.jsdelivr.net/npm/vditor@1.7.2/dist/index.min.js', 'https://cdn.jsdelivr.net/npm/vditor@1.7.3/dist/index.min.js',
'vditorScript') 'vditorScript')
var toolbar = [ var toolbar = [
'emoji', 'emoji',
......
src/main/webapp/js/page.min.js
View file @ 8586355c
This diff is collapsed.
src/main/webapp/scss/admin.css
View file @ 8586355c
This diff is collapsed.
src/main/webapp/scss/base.css
View file @ 8586355c
This diff is collapsed.
src/main/webapp/scss/start.css
View file @ 8586355c
This diff is collapsed.
skins @ 31107a7f
Subproject commit a6d0d7e051b9a6bbea977c72ecba92a00de912d1 Subproject commit 31107a7f0558406d661e1aae98b3a91396c1bdd4
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment