]> BookStack Code Mirror - bookstack/commitdiff
Renamed properties input option as INI
authorDan Brown <redacted>
Thu, 17 Oct 2019 20:16:55 +0000 (21:16 +0100)
committerDan Brown <redacted>
Thu, 17 Oct 2019 20:16:55 +0000 (21:16 +0100)
- Also made INI be recognised as the codemirror "Properties" format.

resources/js/services/code.js
resources/sass/_components.scss
resources/views/components/code-editor.blade.php

index 70355643d51069eccfa4f261f66dcf58aacd3c72..f69f28b8e96f7db6498260681925153acc49f6a0 100644 (file)
@@ -29,6 +29,8 @@ import 'codemirror/mode/yaml/yaml';
 // Addons
 import 'codemirror/addon/scroll/scrollpastend';
 
+// Mapping of potential languages or formats from user input
+// to their proper codemirror modes.
 const modeMap = {
     css: 'css',
     c: 'text/x-csrc',
@@ -43,7 +45,7 @@ const modeMap = {
     haskell: 'haskell',
     hs: 'haskell',
     html: 'htmlmixed',
-    ini: 'ini',
+    ini: 'properties',
     javascript: 'javascript',
     json: {name: 'javascript', json: true},
     js: 'javascript',
index 0172956a76ee48c79ea0b69499e97180b6d16859..2085e06ea4c4aeb35e9bcb09d1fdd771eb6808c1 100644 (file)
@@ -602,7 +602,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 
 #code-editor .lang-options {
-  max-width: 400px;
+  max-width: 480px;
   margin-bottom: $-s;
   a {
     margin-right: $-xs;
index 863cdfd857bd931ea48dea046f65157109be41df..f8377b1208d49e03c3ac0bad95b7610ebd7cf164 100644 (file)
                             <a @click="updateLanguage('C#')">C#</a>
                             <a @click="updateLanguage('Go')">Go</a>
                             <a @click="updateLanguage('HTML')">HTML</a>
+                            <a @click="updateLanguage('INI')">INI</a>
                             <a @click="updateLanguage('Java')">Java</a>
                             <a @click="updateLanguage('JavaScript')">JavaScript</a>
                             <a @click="updateLanguage('JSON')">JSON</a>
                             <a @click="updateLanguage('Lua')">Lua</a>
                             <a @click="updateLanguage('PHP')">PHP</a>
                             <a @click="updateLanguage('Powershell')">Powershell</a>
-                            <a @click="updateLanguage('Properties')">Properties</a>
                             <a @click="updateLanguage('MarkDown')">MarkDown</a>
                             <a @click="updateLanguage('Nginx')">Nginx</a>
                             <a @click="updateLanguage('Python')">Python</a>