liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for code editor modelist

Browse Source
This commit is contained in:
NGPixel 2017-04-02 00:22:52 -04:00
parent fe0c4ce0c0
commit feed55f1d1
3 changed files with 235 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
assets/js/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
client/js/components/editor-codeblock.js
View File

@ -6,6 +6,7 @@ import _ from 'lodash'
import * as ace from 'brace' import * as ace from 'brace'
import 'brace/theme/tomorrow_night' import 'brace/theme/tomorrow_night'
import 'brace/mode/markdown' import 'brace/mode/markdown'
import 'brace-ext-modelist'
let codeEditor = null let codeEditor = null
@ -31,7 +32,7 @@ let loadAceMode = (m) => {
// Vue Code Block instance // Vue Code Block instance
module.exports = (mde, mdeModalOpenState) => { module.exports = (mde, mdeModalOpenState) => {
let modelist = {} // ace.require('ace/ext/modelist') let modelist = ace.acequire('ace/ext/modelist')
let vueCodeBlock = new Vue({ let vueCodeBlock = new Vue({
el: '#modal-editor-codeblock', el: '#modal-editor-codeblock',
data: { data: {
@ -42,7 +43,7 @@ module.exports = (mde, mdeModalOpenState) => {
watch: { watch: {
modeSelected: (val, oldVal) => { modeSelected: (val, oldVal) => {
loadAceMode(val).done(() => { loadAceMode(val).done(() => {
ace.require('ace/mode/' + val) ace.acequire('ace/mode/' + val)
codeEditor.getSession().setMode('ace/mode/' + val) codeEditor.getSession().setMode('ace/mode/' + val)
}) })
} }

2
fuse.js
View File

@ -30,7 +30,7 @@ const args = require('yargs')
// Define aliases // Define aliases
const ALIASES = { const ALIASES = {
'ace': 'ace-builds/src-min-noconflict/ace.js', 'brace-ext-modelist': 'brace/ext/modelist.js',
'simplemde': 'simplemde/dist/simplemde.min.js', 'simplemde': 'simplemde/dist/simplemde.min.js',
'socket.io-client': 'socket.io-client/dist/socket.io.min.js', 'socket.io-client': 'socket.io-client/dist/socket.io.min.js',
'vue': 'vue/dist/vue.js' 'vue': 'vue/dist/vue.js'