Merge branch 'master' of git://github.com/albergoniSivaf/BookStack into albergoniSivaf-master

This commit is contained in:
Dan Brown 2019-12-27 17:03:10 +00:00
commit 891dbfe085
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 3 additions and 0 deletions

View File

@ -25,6 +25,7 @@ import 'codemirror/mode/sql/sql';
import 'codemirror/mode/toml/toml'; import 'codemirror/mode/toml/toml';
import 'codemirror/mode/xml/xml'; import 'codemirror/mode/xml/xml';
import 'codemirror/mode/yaml/yaml'; import 'codemirror/mode/yaml/yaml';
import 'codemirror/mode/pascal/pascal'
// Addons // Addons
import 'codemirror/addon/scroll/scrollpastend'; import 'codemirror/addon/scroll/scrollpastend';
@ -78,6 +79,7 @@ const modeMap = {
xml: 'xml', xml: 'xml',
yaml: 'yaml', yaml: 'yaml',
yml: 'yaml', yml: 'yaml',
pascal: 'text/x-pascal',
}; };
/** /**

View File

@ -33,6 +33,7 @@
<a @click="updateLanguage('SQL')">SQL</a> <a @click="updateLanguage('SQL')">SQL</a>
<a @click="updateLanguage('XML')">XML</a> <a @click="updateLanguage('XML')">XML</a>
<a @click="updateLanguage('YAML')">YAML</a> <a @click="updateLanguage('YAML')">YAML</a>
<a @click="updateLanguage('PASCAL')">Pascal</a>
</small> </small>
</div> </div>
<input @keypress.enter="save()" id="code-editor-language" type="text" @input="updateEditorMode(language)" v-model="language"> <input @keypress.enter="save()" id="code-editor-language" type="text" @input="updateEditorMode(language)" v-model="language">