Skip to content

S
solo-1
Commit 465a51a7 authored by Van's avatar Van
Browse files
Options

⬆ vditor

parent a684dc2a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
package-lock.json
View file @ 465a51a7
...@@ -1160,9 +1160,9 @@ ...@@ -1160,9 +1160,9 @@
"dev": true "dev": true
}, },
"abcjs": { "abcjs": {
"version": "5.8.0", "version": "5.8.1",
"resolved": "https://registry.npmjs.org/abcjs/-/abcjs-5.8.0.tgz", "resolved": "https://registry.npmjs.org/abcjs/-/abcjs-5.8.1.tgz",
"integrity": "sha512-gRU69oZ7ZhETE6TKUqb462tkoDuzLGrtD7d95XguF650GGFlcu4hw91NMwo8Km4007W6tpFPVpLxkAum1pr0/g==", "integrity": "sha512-ZG9mGiPY1oXPH5nkSw+vCVgOik7KFnTuowQXWvD8n1SyhaVdby1rUF4la5CXmbMEH5W6nMn6U4+la2LpHAZLTg==",
"requires": { "requires": {
"midi": "git+https://github.com/paulrosen/MIDI.js.git#abcjs" "midi": "git+https://github.com/paulrosen/MIDI.js.git#abcjs"
} }
...@@ -2162,9 +2162,9 @@ ...@@ -2162,9 +2162,9 @@
} }
}, },
"d3": { "d3": {
"version": "5.10.0", "version": "5.11.0",
"resolved": "https://registry.npmjs.org/d3/-/d3-5.10.0.tgz", "resolved": "https://registry.npmjs.org/d3/-/d3-5.11.0.tgz",
"integrity": "sha512-BFYD1rZk0dYR5/aYLv5P9sB0Ta1COZXAqwj+mb/8Xp9WDJTIY2h9OMGHtKW36QsDEQmx+adA2+C++K7YmlyQWA==", "integrity": "sha512-LXgMVUAEAzQh6WfEEOa8tJX4RA64ZJ6twC3CJ+Xzid+fXWLTZkkglagXav/eOoQgzQi5rzV0xC4Sfspd6hFDHA==",
"requires": { "requires": {
"d3-array": "1", "d3-array": "1",
"d3-axis": "1", "d3-axis": "1",
...@@ -2210,9 +2210,9 @@ ...@@ -2210,9 +2210,9 @@
"integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ==" "integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="
}, },
"d3-brush": { "d3-brush": {
"version": "1.1.2", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.2.tgz", "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.3.tgz",
"integrity": "sha512-0cQBYrlKqLevZZaRE5Hh3W5FGp3c9gvUyJZm3B0Z3iAM3aSkEXt7F+4+vYyJoaL6vEipVM511rMqO3lD6ShyRA==", "integrity": "sha512-v8bbYyCFKjyCzFk/tdWqXwDykY8YWqhXYjcYxfILIit085VZOpj4XJKOMccTsvWxgzSLMJQg5SiqHjslsipEDg==",
"requires": { "requires": {
"d3-dispatch": "1", "d3-dispatch": "1",
"d3-drag": "1", "d3-drag": "1",
...@@ -2356,9 +2356,9 @@ ...@@ -2356,9 +2356,9 @@
} }
}, },
"d3-scale-chromatic": { "d3-scale-chromatic": {
"version": "1.4.0", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.4.0.tgz", "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz",
"integrity": "sha512-0vyEt8ZqhdgzC+IvdkJZL7fc3k7UZyJvMxR3zvU312z/HilJ0N+WSY3099jAxdfhe99ak9VhcK1ChDVVGc8Q0Q==", "integrity": "sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==",
"requires": { "requires": {
"d3-color": "1", "d3-color": "1",
"d3-interpolate": "1" "d3-interpolate": "1"
...@@ -2960,9 +2960,9 @@ ...@@ -2960,9 +2960,9 @@
} }
}, },
"electron-to-chromium": { "electron-to-chromium": {
"version": "1.3.235", "version": "1.3.237",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.235.tgz", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.237.tgz",
"integrity": "sha512-xNabEDbMIKPLQd6xgv4nyyeMaWXIKSJr6G51ZhUemHhbz6kjZAYcygA8CvfEcMF+Mt5eLmDWaLmfSOWdQxzBVQ==" "integrity": "sha512-SPAFjDr/7iiVK2kgTluwxela6eaWjjFkS9rO/iYpB/KGXgccUom5YC7OIf19c8m8GGptWxLU0Em8xM64A/N7Fg=="
}, },
"emoji-regex": { "emoji-regex": {
"version": "6.1.1", "version": "6.1.1",
...@@ -4110,9 +4110,9 @@ ...@@ -4110,9 +4110,9 @@
"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
}, },
"globals-docs": { "globals-docs": {
"version": "2.4.0", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/globals-docs/-/globals-docs-2.4.0.tgz", "resolved": "https://registry.npmjs.org/globals-docs/-/globals-docs-2.4.1.tgz",
"integrity": "sha512-B69mWcqCmT3jNYmSxRxxOXWfzu3Go8NQXPfl2o0qPd1EEFhwW0dFUg9ztTu915zPQzqwIhWAlw6hmfIcCK4kkQ==" "integrity": "sha512-qpPnUKkWnz8NESjrCvnlGklsgiQzlq+rcCxoG5uNQ+dNA7cFMCmn231slLAwS2N/PlkzZ3COL8CcS10jXmLHqg=="
}, },
"globby": { "globby": {
"version": "6.1.0", "version": "6.1.0",
...@@ -5718,9 +5718,9 @@ ...@@ -5718,9 +5718,9 @@
} }
}, },
"node-releases": { "node-releases": {
"version": "1.1.27", "version": "1.1.28",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.27.tgz", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.28.tgz",
"integrity": "sha512-9iXUqHKSGo6ph/tdXVbHFbhRVQln4ZDTIBJCzsa90HimnBYc5jw8RWYt4wBYFHehGyC3koIz5O4mb2fHrbPOuA==", "integrity": "sha512-AQw4emh6iSXnCpDiFe0phYcThiccmkNWMZnFZ+lDJjAP8J0m2fVd59duvUUyuTirQOhIAajTFkzG6FHCLBO59g==",
"requires": { "requires": {
"semver": "^5.3.0" "semver": "^5.3.0"
}, },
...@@ -7979,9 +7979,9 @@ ...@@ -7979,9 +7979,9 @@
"integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=" "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM="
}, },
"vditor": { "vditor": {
"version": "1.7.10", "version": "1.7.15",
"resolved": "https://registry.npmjs.org/vditor/-/vditor-1.7.10.tgz", "resolved": "https://registry.npmjs.org/vditor/-/vditor-1.7.15.tgz",
"integrity": "sha512-egRHigaawa9RzhD3g4ZBpWQUmw1DjIbKnJSQBq4GIQFGvWmltHDxssT6y5dZ3WTnmmfgIjdYOMsksdjkRmEkmA==", "integrity": "sha512-KzEIQMxNJOkKw0adp6YWxF0cs93DwVTvK1WNLcsEkZ7Dzoo0/ZHCgnzX6FS+VXgKACttNkPiwie7QUKDBjh3mg==",
"requires": { "requires": {
"abcjs": "^5.8.0", "abcjs": "^5.8.0",
"diff-match-patch": "^1.0.4", "diff-match-patch": "^1.0.4",
......
package.json
View file @ 465a51a7
...@@ -36,6 +36,6 @@ ...@@ -36,6 +36,6 @@
"gulp-uglify": "^3.0.2" "gulp-uglify": "^3.0.2"
}, },
"dependencies": { "dependencies": {
"vditor": "^1.7.10" "vditor": "^1.7.15"
} }
} }
src/main/webapp/admin/admin-index.ftl
View file @ 465a51a7
...@@ -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.10/dist/index.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/vditor@1.7.15/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>
......
src/main/webapp/js/common.js
View file @ 465a51a7
...@@ -182,13 +182,13 @@ var Util = { ...@@ -182,13 +182,13 @@ var Util = {
return return
} }
Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.7.10/dist/index.min.js', Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.7.15/dist/index.min.js',
'vditorScript') 'vditorScript')
Vditor.mermaidRender(document.body) Vditor.mermaidRender(document.body)
Vditor.chartRender() Vditor.chartRender()
Vditor.abcRender() Vditor.abcRender()
Vditor.mathRender(document.body) Vditor.mathRender(document.body, Label.langLabel)
Vditor.codeRender(document.body, Label.langLabel) Vditor.codeRender(document.body, Label.langLabel)
}, },
/** /**
......
src/main/webapp/js/common.min.js
View file @ 465a51a7
This diff is collapsed.
src/main/webapp/js/page.js
View file @ 465a51a7
...@@ -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.10/dist/index.min.js', 'https://cdn.jsdelivr.net/npm/vditor@1.7.15/dist/index.min.js',
'vditorScript') 'vditorScript')
var toolbar = [ var toolbar = [
'emoji', 'emoji',
......
src/main/webapp/js/page.min.js
View file @ 465a51a7
This diff is collapsed.
src/main/webapp/scss/admin.css
View file @ 465a51a7
This diff is collapsed.
src/main/webapp/scss/base.css
View file @ 465a51a7
This diff is collapsed.
src/main/webapp/scss/start.css
View file @ 465a51a7
This diff is collapsed.
skins @ d2f7b0f9
Subproject commit b55ecd49120446152ab1e7fed41924f250d34fd7 Subproject commit d2f7b0f918ade317165559bd92190a09b6616f54
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