summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorFlorian Orben <florian.orben@gmail.com>2015-10-24 21:55:16 +0200
committerFlorian Orben <florian.orben@gmail.com>2015-10-29 17:26:34 +0100
commit742424228414793e6aaa06ce8a9de182cdfb2957 (patch)
treef434c1e4bcdc91dc1a304fe3e46fb4ae15c69d2a /web
parentaeb0a08d077d35e46451142be1e06a4718a2d6bb (diff)
downloadchat-742424228414793e6aaa06ce8a9de182cdfb2957.tar.gz
chat-742424228414793e6aaa06ce8a9de182cdfb2957.tar.bz2
chat-742424228414793e6aaa06ce8a9de182cdfb2957.zip
Add java and ini language
Forgot to add those altough they are quite common
Diffstat (limited to 'web')
-rw-r--r--web/react/utils/constants.jsx4
-rw-r--r--web/react/utils/markdown.jsx4
2 files changed, 7 insertions, 1 deletions
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 2c9959d4a..1593f6706 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -347,6 +347,8 @@ module.exports = {
cpp: 'C++',
sql: 'SQL',
go: 'Go',
- ruby: 'Ruby'
+ ruby: 'Ruby',
+ java: 'Java',
+ ini: 'ini'
}
};
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index ca26f7701..b5d239eb5 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -28,6 +28,8 @@ const highlightJsCpp = require('highlight.js/lib/languages/cpp.js');
const highlightJsSql = require('highlight.js/lib/languages/sql.js');
const highlightJsGo = require('highlight.js/lib/languages/go.js');
const highlightJsRuby = require('highlight.js/lib/languages/ruby.js');
+const highlightJsJava = require('highlight.js/lib/languages/java.js');
+const highlightJsIni = require('highlight.js/lib/languages/ini.js');
const Constants = require('../utils/constants.jsx');
const HighlightedLanguages = Constants.HighlightedLanguages;
@@ -99,6 +101,8 @@ class MattermostMarkdownRenderer extends marked.Renderer {
highlightJs.registerLanguage('sql', highlightJsSql);
highlightJs.registerLanguage('go', highlightJsGo);
highlightJs.registerLanguage('ruby', highlightJsRuby);
+ highlightJs.registerLanguage('java', highlightJsJava);
+ highlightJs.registerLanguage('ini', highlightJsIni);
}
code(code, language) {