diff options
author | Phil Hughes <me@iamphill.com> | 2018-01-31 16:07:33 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-01-31 16:07:33 +0000 |
commit | f4b91f7ab8e9a86439a2b8a918c9a7487b96633f (patch) | |
tree | f81b6361dcf39c4f9937e573601f9e03ec927b48 | |
parent | 078dac4268cb5e991cc0012f5ad01ca3cb9a39c8 (diff) | |
parent | c41fffdbaaa861ceaffca36460cefc255c548629 (diff) | |
download | gitlab-ce-f4b91f7ab8e9a86439a2b8a918c9a7487b96633f.tar.gz |
Merge branch 'axios-get-render-math' into 'master'
Replace $.get in render math with axios
See merge request gitlab-org/gitlab-ce!16697
-rw-r--r-- | app/assets/javascripts/render_math.js | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/app/assets/javascripts/render_math.js b/app/assets/javascripts/render_math.js index 15205d8a4e2..73b6aafdd12 100644 --- a/app/assets/javascripts/render_math.js +++ b/app/assets/javascripts/render_math.js @@ -7,7 +7,12 @@ // // <code class="js-render-math"></div> // - // Only load once + +import { __ } from './locale'; +import axios from './lib/utils/axios_utils'; +import flash from './flash'; + +// Only load once let katexLoaded = false; // Loop over all math elements and render math @@ -33,19 +38,26 @@ export default function renderMath($els) { if (katexLoaded) { renderWithKaTeX($els); } else { - $.get(gon.katex_css_url, () => { - const css = $('<link>', { - rel: 'stylesheet', - type: 'text/css', - href: gon.katex_css_url, - }); - css.appendTo('head'); - - // Load KaTeX js - $.getScript(gon.katex_js_url, () => { + axios.get(gon.katex_css_url) + .then(() => { + const css = $('<link>', { + rel: 'stylesheet', + type: 'text/css', + href: gon.katex_css_url, + }); + css.appendTo('head'); + }) + .then(() => axios.get(gon.katex_js_url, { + responseType: 'text', + })) + .then(({ data }) => { + // Add katex js to our document + $.globalEval(data); + }) + .then(() => { katexLoaded = true; renderWithKaTeX($els); // Run KaTeX - }); - }); + }) + .catch(() => flash(__('An error occurred while rendering KaTeX'))); } } |