Skip to content

S
solo-1
Commit 68fb79ba authored by Van's avatar Van
Browse files
Options

Merge branch '3.6.0-dev' into 3.6.1-dev

parents 58a23177 10f550ca
Hide whitespace changes
Inline Side-by-side
Showing with 1381 additions and 1467 deletions
package-lock.json
View file @ 68fb79ba
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
View file @ 68fb79ba
...@@ -36,6 +36,6 @@ ...@@ -36,6 +36,6 @@
"gulp-uglify": "^3.0.1" "gulp-uglify": "^3.0.1"
}, },
"dependencies": { "dependencies": {
"vditor": "^1.2.10" "vditor": "^1.3.0"
} }
} }
src/main/webapp/admin/admin-index.ftl
View file @ 68fb79ba
...@@ -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.2.10/dist/index.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/vditor@1.3.0/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 @ 68fb79ba
...@@ -158,7 +158,7 @@ var Util = { ...@@ -158,7 +158,7 @@ var Util = {
if (!Label.markedAvailable) { if (!Label.markedAvailable) {
if (typeof hljs === 'undefined') { if (typeof hljs === 'undefined') {
$.ajax({ $.ajax({
url: 'https://cdn.jsdelivr.net/npm/vditor@1.2.10/src/assets/js/highlight.pack.js', url: 'https://cdn.jsdelivr.net/npm/vditor@1.3.0/src/assets/js/highlight.pack.js',
dataType: 'script', dataType: 'script',
cache: true, cache: true,
success: function () { success: function () {
...@@ -182,7 +182,7 @@ var Util = { ...@@ -182,7 +182,7 @@ var Util = {
return return
} }
Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.2.10/dist/index.min.js', Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.3.0/dist/index.min.js',
'vditorScript') 'vditorScript')
Vditor.mermaidRender(document.body) Vditor.mermaidRender(document.body)
......
src/main/webapp/js/page.js
View file @ 68fb79ba
...@@ -113,7 +113,7 @@ $.extend(Page.prototype, { ...@@ -113,7 +113,7 @@ $.extend(Page.prototype, {
if (!$('#soloEditorComment').hasClass('vditor')) { if (!$('#soloEditorComment').hasClass('vditor')) {
var that = this var that = this
Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.2.10/dist/index.min.js', 'vditorScript') Util.addScript('https://cdn.jsdelivr.net/npm/vditor@1.3.0/dist/index.min.js', 'vditorScript')
window.vditor = new Vditor('soloEditorComment', { window.vditor = new Vditor('soloEditorComment', {
placeholder: that.tips.commentContentCannotEmptyLabel, placeholder: that.tips.commentContentCannotEmptyLabel,
height: 180, height: 180,
......
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