]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'perl_syntax_highlight' of git://github.com/Iyeyasu/BookStack into Iyeya...
authorDan Brown <redacted>
Fri, 6 Mar 2020 19:54:15 +0000 (19:54 +0000)
committerDan Brown <redacted>
Fri, 6 Mar 2020 19:54:15 +0000 (19:54 +0000)
1  2 
resources/js/services/code.js
resources/views/components/code-editor.blade.php

index 21f331a63bd270300399167b2f0152fad0e374e3,27413764ac7697dd316d184ca4977ef1cee73a10..14801de9c9aaec93cf89d8955c36d947ff2a68bb
@@@ -5,17 -5,16 +5,18 @@@ import Clipboard from "clipboard/dist/c
  import 'codemirror/mode/css/css';
  import 'codemirror/mode/clike/clike';
  import 'codemirror/mode/diff/diff';
 +import 'codemirror/mode/fortran/fortran';
  import 'codemirror/mode/go/go';
 +import 'codemirror/mode/haskell/haskell';
  import 'codemirror/mode/htmlmixed/htmlmixed';
  import 'codemirror/mode/javascript/javascript';
  import 'codemirror/mode/julia/julia';
  import 'codemirror/mode/lua/lua';
 -import 'codemirror/mode/haskell/haskell';
  import 'codemirror/mode/markdown/markdown';
  import 'codemirror/mode/mllike/mllike';
  import 'codemirror/mode/nginx/nginx';
+ import 'codemirror/mode/perl/perl';
 +import 'codemirror/mode/pascal/pascal';
  import 'codemirror/mode/php/php';
  import 'codemirror/mode/powershell/powershell';
  import 'codemirror/mode/properties/properties';
@@@ -27,6 -26,7 +28,6 @@@ 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';
@@@ -44,8 -44,6 +45,8 @@@ const modeMap = 
      'c#': 'text/x-csharp',
      csharp: 'text/x-csharp',
      diff: 'diff',
 +    for: 'fortran',
 +    fortran: 'fortran',
      go: 'go',
      haskell: 'haskell',
      hs: 'haskell',
@@@ -62,6 -60,8 +63,8 @@@
      markdown: 'markdown',
      ml: 'mllike',
      nginx: 'nginx',
+     perl: 'perl',
+     pl: 'perl',
      powershell: 'powershell',
      properties: 'properties',
      ocaml: 'mllike',
@@@ -114,7 -114,7 +117,7 @@@ function highlightWithin(parent) 
  function highlightElem(elem) {
      const innerCodeElem = elem.querySelector('code[class^=language-]');
      elem.innerHTML = elem.innerHTML.replace(/<br\s*[\/]?>/gi ,'\n');
 -    const content = elem.textContent;
 +    const content = elem.textContent.trimEnd();
  
      let mode = '';
      if (innerCodeElem !== null) {
@@@ -188,7 -188,7 +191,7 @@@ function getMode(suggestion, content) 
   * @returns {*|string}
   */
  function getTheme() {
 -    return window.codeTheme || 'mdn-like';
 +    return window.codeTheme || 'default';
  }
  
  /**
index 25b59eabdfec003f80a2fbcb17c0637c88d0d3e8,f6d93f2cdfc8d7c5fff3d915fd2df3d297756b3d..d6046664e7a9a9efa693549b1cd288594012cc4c
@@@ -16,7 -16,6 +16,7 @@@
                              <a @click="updateLanguage('C')">C</a>
                              <a @click="updateLanguage('C++')">C++</a>
                              <a @click="updateLanguage('C#')">C#</a>
 +                            <a @click="updateLanguage('Fortran')">Fortran</a>
                              <a @click="updateLanguage('Go')">Go</a>
                              <a @click="updateLanguage('HTML')">HTML</a>
                              <a @click="updateLanguage('INI')">INI</a>
@@@ -27,6 -26,7 +27,7 @@@
                              <a @click="updateLanguage('MarkDown')">MarkDown</a>
                              <a @click="updateLanguage('Nginx')">Nginx</a>
                              <a @click="updateLanguage('PASCAL')">Pascal</a>
+                             <a @click="updateLanguage('Perl')">Perl</a>
                              <a @click="updateLanguage('PHP')">PHP</a>
                              <a @click="updateLanguage('Powershell')">Powershell</a>
                              <a @click="updateLanguage('Python')">Python</a>