QingdaoU/OnlineJudgeFE
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudgeFE.git synced 2024-12-28 23:41:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into l10n

Browse Source
This commit is contained in:
Shaohua Wen 2019-10-11 09:11:19 +08:00 committed by GitHub
commit 8131f813d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
package-lock.json generated
View File

@ -10837,15 +10837,41 @@
"dev": true "dev": true
}, },
"tar-simditor": { "tar-simditor": {
"version": "2.4.3", "version": "3.0.5",
"resolved": "https://registry.npmjs.org/tar-simditor/-/tar-simditor-2.4.3.tgz", "resolved": "https://registry.npmjs.org/tar-simditor/-/tar-simditor-3.0.5.tgz",
"integrity": "sha512-yHu66vpvY9fw8RDw6a/pAt2XsJRH0tVix8y6sgg7ieiCTA0mnmQUqS4WsiWOhGyFsmPuJq2EnMfvYyG7bHWHcw==", "integrity": "sha512-fUQhIVVfp2crf2wanLCpDLWp5Mao/i9lTQeS9Mj46/IOF+FuAKKyJ/ULk6+OlH0Ro6VEVGzlr/bQFArJdCfKsQ==",
"requires": { "requires": {
"marked": "^0.3.5", "marked": "^0.3.19",
"simple-hotkeys": "~1.0.3", "simple-hotkeys": "github:itargaryen/simple-hotkeys",
"simple-module": "~2.0.6", "simple-module": "github:itargaryen/simple-module#v2.1.0",
"simple-uploader": "~2.0.7", "simple-uploader": "github:itargaryen/simple-uploader#v2.1.0",
"to-markdown": "^3.1.0" "to-markdown": "^3.1.1"
},
"dependencies": {
"jquery": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/jquery/-/jquery-3.1.1.tgz",
"integrity": "sha1-NHwcIcfgBBFeCk2jLOzgQfrTyKM="
},
"simple-hotkeys": {
"version": "github:itargaryen/simple-hotkeys#8a6b2cf19d06100ac86d7ce4d442df08c561b7e9",
"from": "github:itargaryen/simple-hotkeys"
},
"simple-module": {
"version": "github:itargaryen/simple-module#ea2688c579170eca533cd0bd8ba7f83c8d241a1c",
"from": "github:itargaryen/simple-module#v2.1.0",
"requires": {
"jquery": "=3.1.1"
}
},
"simple-uploader": {
"version": "github:itargaryen/simple-uploader#79d795ca1ce0b163c0e335fddad5bf9393004780",
"from": "github:itargaryen/simple-uploader#v2.1.0",
"requires": {
"jquery": "=3.1.1",
"simple-module": "github:itargaryen/simple-module#v2.1.0"
}
}
} }
}, },
"tar-simditor-markdown": { "tar-simditor-markdown": {
@ -10860,6 +10886,20 @@
"simple-uploader": "^2.0.7", "simple-uploader": "^2.0.7",
"tar-simditor": "^2.3.15", "tar-simditor": "^2.3.15",
"to-markdown": "^3.1.0" "to-markdown": "^3.1.0"
},
"dependencies": {
"tar-simditor": {
"version": "2.4.3",
"resolved": "https://registry.npmjs.org/tar-simditor/-/tar-simditor-2.4.3.tgz",
"integrity": "sha512-yHu66vpvY9fw8RDw6a/pAt2XsJRH0tVix8y6sgg7ieiCTA0mnmQUqS4WsiWOhGyFsmPuJq2EnMfvYyG7bHWHcw==",
"requires": {
"marked": "^0.3.5",
"simple-hotkeys": "~1.0.3",
"simple-module": "~2.0.6",
"simple-uploader": "~2.0.7",
"to-markdown": "^3.1.0"
}
}
} }
}, },
"terser": { "terser": {

1
package.json
View File

@ -25,6 +25,7 @@
"papaparse": "^4.4.0", "papaparse": "^4.4.0",
"raven-js": "^3.25.0", "raven-js": "^3.25.0",
"screenfull": "^3.3.2", "screenfull": "^3.3.2",
"tar-simditor": "^3.0.5",
"tar-simditor-markdown": "^1.2.3", "tar-simditor-markdown": "^1.2.3",
"vue": "^2.5.16", "vue": "^2.5.16",
"vue-analytics": "^5.10.4", "vue-analytics": "^5.10.4",

5
src/pages/admin/components/Simditor.vue
View File

@ -37,8 +37,11 @@
url: '/api/admin/upload_image/', url: '/api/admin/upload_image/',
params: null, params: null,
fileKey: 'image', fileKey: 'image',
connectionCount: 3, connectionCount: 3
leaveConfirm: this.$i18n.t('m.Uploading_is_in_progress') leaveConfirm: this.$i18n.t('m.Uploading_is_in_progress')
},
allowedStyles: {
span: ['color'
} }
}) })
this.editor.on('valuechanged', (e, src) => { this.editor.on('valuechanged', (e, src) => {