Skip to content

S
solo-1
Commit 230450f2 authored by Van's avatar Van
Browse files
Options

🎇 fix #12904

parent 493a8f97
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 112 deletions
package-lock.json
View file @ 230450f2
......@@ -8097,9 +8097,9 @@
"integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM="
},
"vditor": {
"version": "1.8.6",
"resolved": "https://registry.npmjs.org/vditor/-/vditor-1.8.6.tgz",
"integrity": "sha512-/jEr5xB98Q0IbDYNM9+LjYY8jtlE6zBUE5/ccEivPnqF66X2zAJQC8Sta8m0/bHgqeRFynjFnYt9eJ5pXUEQzg==",
"version": "1.8.8",
"resolved": "https://registry.npmjs.org/vditor/-/vditor-1.8.8.tgz",
"integrity": "sha512-mMILlCHJHrtlbWyLU2xswzVFkTtA1FvO2wtvDio6/vAOvCt2nr4DGn2CVzgZZxAd45/EwXfzADzlY87q4utMSQ==",
"requires": {
"abcjs": "^5.8.0",
"diff-match-patch": "^1.0.4",
......
package.json
View file @ 230450f2
......@@ -36,6 +36,6 @@
"gulp-uglify": "^3.0.2"
},
"dependencies": {
"vditor": "^1.8.6"
"vditor": "^1.8.8"
}
}
src/main/webapp/admin/admin-index.ftl
View file @ 230450f2
......@@ -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.6/dist/index.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vditor@1.8.8/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/admin/admin-preference.ftl
View file @ 230450f2
......@@ -83,98 +83,45 @@
<option value="titleAndContent">${titleAndContentLabel}</option>
</select>
<label for="hljsTheme">
<a href="https://highlightjs.org/static/demo/" target="_blank">${previewLabel}</a>${hljsThemeLabel}
<a href="https://xyproto.github.io/splash/docs/longer/all.html" target="_blank">${previewLabel}</a>${hljsThemeLabel}
</label>
<select id="hljsTheme">
<option value="default">Default</option>
<option value="a11y-dark">A 11 Y Dark</option>
<option value="a11y-light">A 11 Y Light</option>
<option value="agate">Agate</option>
<option value="an-old-hope">An Old Hope</option>
<option value="androidstudio">Androidstudio</option>
<option value="arduino-light">Arduino Light</option>
<option value="arta">Arta</option>
<option value="ascetic">Ascetic</option>
<option value="atelier-cave-dark">Atelier Cave Dark</option>
<option value="atelier-cave-light">Atelier Cave Light</option>
<option value="atelier-dune-dark">Atelier Dune Dark</option>
<option value="atelier-dune-light">Atelier Dune Light</option>
<option value="atelier-estuary-dark">Atelier Estuary Dark</option>
<option value="atelier-estuary-light">Atelier Estuary Light</option>
<option value="atelier-forest-dark">Atelier Forest Dark</option>
<option value="atelier-forest-light">Atelier Forest Light</option>
<option value="atelier-heath-dark">Atelier Heath Dark</option>
<option value="atelier-heath-light">Atelier Heath Light</option>
<option value="atelier-lakeside-dark">Atelier Lakeside Dark</option>
<option value="atelier-lakeside-light">Atelier Lakeside Light</option>
<option value="atelier-plateau-dark">Atelier Plateau Dark</option>
<option value="atelier-plateau-light">Atelier Plateau Light</option>
<option value="atelier-savanna-dark">Atelier Savanna Dark</option>
<option value="atelier-savanna-light">Atelier Savanna Light</option>
<option value="atelier-seaside-dark">Atelier Seaside Dark</option>
<option value="atelier-seaside-light">Atelier Seaside Light</option>
<option value="atelier-sulphurpool-dark">Atelier Sulphurpool Dark</option>
<option value="atelier-sulphurpool-light">Atelier Sulphurpool Light</option>
<option value="atom-one-dark-reasonable">Atom One Dark Reasonable</option>
<option value="atom-one-dark">Atom One Dark</option>
<option value="atom-one-light">Atom One Light</option>
<option value="brown-paper">Brown Paper</option>
<option value="codepen-embed">Codepen Embed</option>
<option value="color-brewer">Color Brewer</option>
<option value="darcula">Darcula</option>
<option value="dark">Dark</option>
<option value="darkula">Darkula</option>
<option value="docco">Docco</option>
<option value="dracula">Dracula</option>
<option value="far">Far</option>
<option value="foundation">Foundation</option>
<option value="github-gist">Github Gist</option>
<option value="github">Github</option>
<option value="gml">Gml</option>
<option value="googlecode">Googlecode</option>
<option value="grayscale">Grayscale</option>
<option value="gruvbox-dark">Gruvbox Dark</option>
<option value="gruvbox-light">Gruvbox Light</option>
<option value="hopscotch">Hopscotch</option>
<option value="hybrid">Hybrid</option>
<option value="idea">Idea</option>
<option value="ir-black">Ir Black</option>
<option value="isbl-editor-dark">Isbl Editor Dark</option>
<option value="isbl-editor-light">Isbl Editor Light</option>
<option value="kimbie.dark">Kimbie Dark</option>
<option value="kimbie.light">Kimbie Light</option>
<option value="lightfair">Lightfair</option>
<option value="magula">Magula</option>
<option value="mono-blue">Mono Blue</option>
<option value="monokai-sublime">Monokai Sublime</option>
<option value="monokai">Monokai</option>
<option value="nord">Nord</option>
<option value="obsidian">Obsidian</option>
<option value="ocean">Ocean</option>
<option value="paraiso-dark">Paraiso Dark</option>
<option value="paraiso-light">Paraiso Light</option>
<option value="pojoaque">Pojoaque</option>
<option value="purebasic">Purebasic</option>
<option value="qtcreator_dark">Qtcreator Dark</option>
<option value="qtcreator_light">Qtcreator Light</option>
<option value="railscasts">Railscasts</option>
<option value="rainbow">Rainbow</option>
<option value="routeros">Routeros</option>
<option value="school-book">School Book</option>
<option value="shades-of-purple">Shades Of Purple</option>
<option value="solarized-dark">Solarized Dark</option>
<option value="solarized-light">Solarized Light</option>
<option value="sunburst">Sunburst</option>
<option value="tomorrow-night-blue">Tomorrow Night Blue</option>
<option value="tomorrow-night-bright">Tomorrow Night Bright</option>
<option value="tomorrow-night-eighties">Tomorrow Night Eighties</option>
<option value="tomorrow-night">Tomorrow Night</option>
<option value="tomorrow">Tomorrow</option>
<option value="vs">Vs</option>
<option value="vs2015">Vs 2015</option>
<option value="xcode">Xcode</option>
<option value="xt256">Xt 256</option>
<option value="zenburn">Zenburn</option>
<option value="abap">abap</option>
<option value="algol">algol</option>
<option value="algol_nu">algol_nu</option>
<option value="arduino">arduino</option>
<option value="autumn">autumn</option>
<option value="borland">borland</option>
<option value="bw">bw</option>
<option value="colorful">colorful</option>
<option value="dracula">dracula</option>
<option value="emacs">emacs</option>
<option value="friendly">friendly</option>
<option value="fruity">fruity</option>
<option value="github">github</option>
<option value="igor">igor</option>
<option value="lovelace">lovelace</option>
<option value="manni">manni</option>
<option value="monokai">monokai</option>
<option value="monokailight">monokailight</option>
<option value="murphy">murphy</option>
<option value="native">native</option>
<option value="paraiso-dark">paraiso-dark</option>
<option value="paraiso-light">paraiso-light</option>
<option value="pastie">pastie</option>
<option value="perldoc">perldoc</option>
<option value="pygments">pygments</option>
<option value="rainbow_dash">rainbow_dash</option>
<option value="rrt">rrt</option>
<option value="solarized-dark">solarized-dark</option>
<option value="solarized-dark256">solarized-dark256</option>
<option value="solarized-light">solarized-light</option>
<option value="swapoff">swapoff</option>
<option value="tango">tango</option>
<option value="trac">trac</option>
<option value="vim">vim</option>
<option value="vs">vs</option>
<option value="xcode">xcode</option>
</select>
<label for="mostUsedTagDisplayCount">${indexTagDisplayCnt1Label}</label>
<input id="mostUsedTagDisplayCount" class="normalInput" type="text"/>
......
src/main/webapp/js/admin/admin.min.js
View file @ 230450f2
This diff is collapsed.
src/main/webapp/js/admin/editor.js
View file @ 230450f2
......@@ -48,6 +48,10 @@ $.extend(SoloEditor.prototype, {
delay: 500,
mode: this.conf.previewMode,
url: Label.servePath + '/console/markdown/2html',
hljs: {
enable: !Label.luteAvailable,
style: Label.hljsStyle,
},
parse: function(element) {
if (element.style.display === 'none') {
return
......
src/main/webapp/js/common.js
View file @ 230450f2
......@@ -147,9 +147,6 @@ var Util = {
* @description 解析语法高亮
*/
parseLanguage: function () {
if ($('.vditor-reset pre > code').length === 0) {
return
}
Vditor.highlightRender(Label.hljsStyle, !Label.luteAvailable, document)
},
/**
......@@ -158,15 +155,15 @@ var Util = {
*/
parseMarkdown: function () {
if(!Vditor) {
Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.8.6/dist/method.min.js',
if (typeof Vditor === 'undefined') {
Util.addScript(
'https://cdn.jsdelivr.net/npm/vditor@1.8.8/dist/method.min.js',
'vditorPreviewScript')
}
Vditor.codeRender(document.body, Label.langLabel)
if (Label.markedAvailable) {
// TODO: 渲染引擎修改为 lute 后需修改为 Vditor.mathRenderByLute(document.body)
Vditor.mathRender(document.body)
if (Label.luteAvailable) {
Vditor.mathRenderByLute(document.body)
} else {
Vditor.mathRender(document.body)
}
......
src/main/webapp/js/common.min.js
View file @ 230450f2
This diff is collapsed.
src/main/webapp/js/page.js
View file @ 230450f2
......@@ -103,7 +103,7 @@ $.extend(Page.prototype, {
if (!$('#soloEditorComment').hasClass('vditor')) {
var that = this
Util.addScript(
'https://cdn.jsdelivr.net/npm/vditor@1.8.6/dist/index.min.js',
'https://cdn.jsdelivr.net/npm/vditor@1.8.8/dist/index.min.js',
'vditorScript')
var toolbar = [
'emoji',
......@@ -169,7 +169,7 @@ $.extend(Page.prototype, {
mode: 'editor',
url: Label.servePath + '/console/markdown/2html',
hljs: {
enable: true,
enable: !Label.luteAvailable,
style: Label.hljsStyle,
},
parse: function (element) {
......
src/main/webapp/js/page.min.js
View file @ 230450f2
This diff is collapsed.
src/main/webapp/scss/admin.css
View file @ 230450f2
This diff is collapsed.
src/main/webapp/scss/base.css
View file @ 230450f2
This diff is collapsed.
src/main/webapp/scss/start.css
View file @ 230450f2
This diff is collapsed.
skins @ 2fbe6d9f
Subproject commit f4db24d52a9e3db08d911f90c512a4b1b1ae99a4
Subproject commit 2fbe6d9f89f8bc086dce1fabb4800420944c1e81
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