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

[bookstack] / resources / js / services / code.js

diff --git a/resources/js/services/code.js b/resources/js/services/code.js
index 61aac7dc5b4909e9c56a13069fe59287fee2a6d5..70355643d51069eccfa4f261f66dcf58aacd3c72 100644 (file)
--- a/resources/js/services/code.js
+++ b/resources/js/services/code.js
@@ -16,6 +16,7 @@ import 'codemirror/mode/mllike/mllike';
 import 'codemirror/mode/nginx/nginx';
 import 'codemirror/mode/php/php';
 import 'codemirror/mode/powershell/powershell';
+import 'codemirror/mode/properties/properties';
 import 'codemirror/mode/python/python';
 import 'codemirror/mode/ruby/ruby';
 import 'codemirror/mode/rust/rust';
@@ -42,6 +43,7 @@ const modeMap = {
     haskell: 'haskell',
     hs: 'haskell',
     html: 'htmlmixed',
+    ini: 'ini',
     javascript: 'javascript',
     json: {name: 'javascript', json: true},
     js: 'javascript',
@@ -54,6 +56,7 @@ const modeMap = {
     ml: 'mllike',
     nginx: 'nginx',
     powershell: 'powershell',
+    properties: 'properties',
     ocaml: 'mllike',
     php: 'php',
     py: 'python',
@@ -102,7 +105,7 @@ function highlightElem(elem) {
         value: content,
         mode:  mode,
         lineNumbers: true,
-        lineWrapping: true,
+        lineWrapping: false,
         theme: getTheme(),
         readOnly: true
     });
@@ -189,7 +192,7 @@ function wysiwygView(elem) {
         value: content,
         mode:  getMode(lang),
         lineNumbers: true,
-        lineWrapping: true,
+        lineWrapping: false,
         theme: getTheme(),
         readOnly: true
     });
@@ -215,7 +218,7 @@ function popupEditor(elem, modeSuggestion) {
         value: content,
         mode:  getMode(modeSuggestion),
         lineNumbers: true,
-        lineWrapping: true,
+        lineWrapping: false,
         theme: getTheme()
     });
 }