diff options
author | Corey Hulen <corey@hulen.com> | 2015-11-10 14:27:52 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-11-10 14:27:52 -0800 |
commit | 6272f0f0252edcf86139d656ce13d3e3189da19e (patch) | |
tree | 44712210cd9b13f2b5f81545e7e5317921f04baa /web/react | |
parent | 31387be90b9b7e4b7e6a55d05af3d858bef6680a (diff) | |
parent | e3f3f4b10505cb4d506192837d95665ffc982513 (diff) | |
download | chat-6272f0f0252edcf86139d656ce13d3e3189da19e.tar.gz chat-6272f0f0252edcf86139d656ce13d3e3189da19e.tar.bz2 chat-6272f0f0252edcf86139d656ce13d3e3189da19e.zip |
Merge pull request #1351 from florianorben/latex-support
Add latex support
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/.eslintrc | 5 | ||||
-rw-r--r-- | web/react/utils/markdown.jsx | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/web/react/.eslintrc b/web/react/.eslintrc index 7c98a2f0b..d4d28e863 100644 --- a/web/react/.eslintrc +++ b/web/react/.eslintrc @@ -6,7 +6,7 @@ "modules": true, "classes": true, "arrowFunctions": true, - "defaultParams": true, + "defaultParams": true }, "parser": "babel-eslint", "plugins": [ @@ -22,7 +22,8 @@ "React": false, "ReactDOM": false, "ReactBootstrap": false, - "Chart": false + "Chart": false, + "katex": false }, "rules": { "comma-dangle": [2, "never"], diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx index 946f93078..4d1a35d19 100644 --- a/web/react/utils/markdown.jsx +++ b/web/react/utils/markdown.jsx @@ -69,6 +69,15 @@ class MattermostMarkdownRenderer extends marked.Renderer { usedLanguage = 'xml'; } + if (usedLanguage && (usedLanguage === 'tex' || usedLanguage === 'latex')) { + try { + var html = katex.renderToString(TextFormatting.sanitizeHtml(code), {throwOnError: false, displayMode: true}); + return '<div class="post-body--code tex">' + html + '</div>'; + } catch (e) { + return '<div class="post-body--code">' + TextFormatting.sanitizeHtml(code) + '</div>'; + } + } + if (!usedLanguage || highlightJs.listLanguages().indexOf(usedLanguage) < 0) { let parsed = super.code(code, usedLanguage); return '<div class="post-body--code"><code class="hljs">' + TextFormatting.sanitizeHtml($(parsed).text()) + '</code></div>'; |