浏览代码

Fix for code editor modelist

NGPixel 8 年之前
父节点
当前提交
feed55f1d1
共有 3 个文件被更改,包括 25 次插入10 次删除
  1. 21 7
      assets/js/bundle.min.js
  2. 3 2
      client/js/components/editor-codeblock.js
  3. 1 1
      fuse.js

文件差异内容过多而无法显示
+ 21 - 7
assets/js/bundle.min.js


+ 3 - 2
client/js/components/editor-codeblock.js

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

+ 1 - 1
fuse.js

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

部分文件因为文件数量过多而无法显示