Skip to content

Commit

Permalink
⬆️ vditor fix #8
Browse files Browse the repository at this point in the history
  • Loading branch information
Vanessa219 committed Dec 29, 2019
1 parent a099c8d commit b43cf3b
Show file tree
Hide file tree
Showing 20 changed files with 3,582 additions and 1,805 deletions.
5,319 changes: 3,552 additions & 1,767 deletions console/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions console/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"babel-polyfill": "^6.26.0",
"particles.js": "^2.0.0",
"sha512crypt-node": "^0.1.0",
"vditor": "^1.10.11",
"vditor": "^2.0.3",
"vue-axios": "^2.1.4",
"vue-i18n": "^8.11.2",
"vuetify": "git+https://github.com/Vanessa219/vuetify.git#v1.2.12"
Expand All @@ -40,7 +40,7 @@
"eslint-plugin-promise": "^4.1.1",
"eslint-plugin-standard": "^4.0.0",
"node-sass": "^4.12.0",
"nuxt": "^2.7.1",
"nuxt": "^2.11.0",
"sass-loader": "^7.1.0"
}
}
3 changes: 0 additions & 3 deletions console/pages/admin/articles/post/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,6 @@
typewriterMode: true,
tab: '\t',
cache: this.$route.query.id ? false : true,
hint: {
emojiPath: 'https://cdn.jsdelivr.net/npm/vditor/dist/images/emoji',
},
preview: {
delay: 500,
mode: data.mode,
Expand Down
2 changes: 1 addition & 1 deletion pipe.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Server": "http://localhost:5897",
"StaticServer": "",
"StaticResourceVersion": "1576984333042",
"StaticResourceVersion": "1577587957937",
"RuntimeMode": "dev",
"LogLevel": "debug",
"ShowSQL": false,
Expand Down
29 changes: 12 additions & 17 deletions theme/js/article.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @fileoverview article tool for every theme
*
* @author <a href="http://vanessa.b3log.org">Liyuan Li</a>
* @version 0.5.0.2, Sep 18, 2019
* @version 0.5.0.3, Dec 29, 2019
*/

import $ from 'jquery'
Expand Down Expand Up @@ -103,45 +103,43 @@ export const ShowEditor = (reply, id, commentId) => {
'bold',
'italic',
'strike',
'|',
'line',
'quote',
'link',
'|',
'list',
'ordered-list',
'check',
'|',
'quote',
'line',
'code',
'inline-code',
'table',
'|',
'undo',
'redo',
'|',
'link',
'table',
'|',
'wysiwyg',
'both',
'preview',
'format',
'|',
'devtools',
'fullscreen',
'devtools',
'info',
'help',
]
let resizeEnable = true
if ($(window).width() < 768) {
toolbar = [
'emoji',
'line',
'quote',
'bold',
'italic',
'link',
'list',
'ordered-list',
'check',
'link',
'wysiwyg',
'preview',
'format',
'info',
'fullscreen',
'help',
]
resizeEnable = false
Expand All @@ -157,9 +155,6 @@ export const ShowEditor = (reply, id, commentId) => {
ctrlEnter: () => {
$('#pipeEditorAdd').click()
},
hint: {
emojiPath: 'https://cdn.jsdelivr.net/npm/vditor/dist/images/emoji',
},
preview: {
delay: 500,
mode: 'editor',
Expand Down
2 changes: 1 addition & 1 deletion theme/js/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ export const initPjax = (cb) => {
(() => {
$.ajax({
method: 'GET',
url: 'https://cdn.jsdelivr.net/npm/vditor@1.10.11/dist/index.min.js',
url: 'https://cdn.jsdelivr.net/npm/vditor@2.0.3/dist/index.min.js',
dataType: 'script',
cache: true,
success: () => {
Expand Down
2 changes: 1 addition & 1 deletion theme/x/9IPHP/css/common.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/9IPHP/js/common.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Fara/css/common.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Fara/js/common.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Gina/css/common.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Gina/js/common.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Koma/css/common.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Koma/js/common.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Littlewin/css/common.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Littlewin/js/common.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Medium/css/common.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Medium/js/common.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Next/css/common.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion theme/x/Next/js/common.min.js

Large diffs are not rendered by default.

0 comments on commit b43cf3b

Please sign in to comment.