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

diff --git a/resources/js/services/code.js b/resources/js/services/code.js
index 93c3e431f4f5baf7482c898539599f4f8ad2e3e8..8e517dde45abcd794537a6c87ac56092af6fd9d2 100644 (file)
--- a/resources/js/services/code.js
+++ b/resources/js/services/code.js
@@ -25,6 +25,7 @@ import 'codemirror/mode/sql/sql';
 import 'codemirror/mode/toml/toml';
 import 'codemirror/mode/xml/xml';
 import 'codemirror/mode/yaml/yaml';
+import 'codemirror/mode/pascal/pascal'
 
 // Addons
 import 'codemirror/addon/scroll/scrollpastend';
@@ -78,6 +79,7 @@ const modeMap = {
     xml: 'xml',
     yaml: 'yaml',
     yml: 'yaml',
+    pascal: 'text/x-pascal',
 };
 
 /**

diff --git a/resources/views/components/code-editor.blade.php b/resources/views/components/code-editor.blade.php
index f8377b1208d49e03c3ac0bad95b7610ebd7cf164..eac5ce1653e55a55142b1eb4de60e2ef1a60c76f 100644 (file)
--- a/resources/views/components/code-editor.blade.php
+++ b/resources/views/components/code-editor.blade.php
@@ -33,6 +33,7 @@
                             <a @click="updateLanguage('SQL')">SQL</a>
                             <a @click="updateLanguage('XML')">XML</a>
                             <a @click="updateLanguage('YAML')">YAML</a>
+                            <a @click="updateLanguage('PASCAL')">Pascal</a>
                         </small>
                     </div>
                     <input @keypress.enter="save()" id="code-editor-language" type="text" @input="updateEditorMode(language)" v-model="language">