JSON5 syntax highlighting in Admin UI

line · Dec 11, 2021 · 29b6eb9 · 29b6eb9
1 parent 4216543
commit 29b6eb9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/build.gradle b/server/build.gradle
@@ -57,7 +57,7 @@ clientDependencies {
     installDir = "${project.projectDir}/src/main/resources/webapp/vendor"
     copyExcludes = ['**/Gruntfile.js', 'gulpfile.js', 'source/**', 'test', 'karma.conf.js', 'index.js']
     npm {
-        'ace-builds'('1.2.5', from: 'src-min-noconflict')
+        'ace-builds'('1.4.13', from: 'src-min-noconflict')
         'angular'('1.5.8')
         'angular-cache-buster'('0.4.3')
         'angular-cookies'('1.5.8')

diff --git a/server/src/main/resources/webapp/scripts/components/util/ace-editor.directive.js b/server/src/main/resources/webapp/scripts/components/util/ace-editor.directive.js
@@ -131,7 +131,7 @@ angular.module('CentralDogmaAdmin')
                        var modelist = window.ace.require('ace/ext/modelist');
                        var mode = modelist.getModeForPath(value).mode;
                        session.setMode(mode);
-                       if (mode === 'ace/mode/json') {
+                       if (mode === 'ace/mode/json' || mode === 'ace/mode/json5') {
                          session.setTabSize(2);
                        } else {
                          session.setTabSize(4);