diff options
Diffstat (limited to 'app/assets/javascripts/behaviors/markdown/render_gfm.js')
-rw-r--r-- | app/assets/javascripts/behaviors/markdown/render_gfm.js | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/render_gfm.js b/app/assets/javascripts/behaviors/markdown/render_gfm.js index 063393c9cd1..c9ae3706383 100644 --- a/app/assets/javascripts/behaviors/markdown/render_gfm.js +++ b/app/assets/javascripts/behaviors/markdown/render_gfm.js @@ -1,10 +1,8 @@ import $ from 'jquery'; import syntaxHighlight from '~/syntax_highlight'; -import initUserPopovers from '../../user_popovers'; import highlightCurrentUser from './highlight_current_user'; import { renderKroki } from './render_kroki'; import renderMath from './render_math'; -import renderMermaid from './render_mermaid'; import renderSandboxedMermaid from './render_sandboxed_mermaid'; import renderMetrics from './render_metrics'; @@ -16,19 +14,15 @@ $.fn.renderGFM = function renderGFM() { syntaxHighlight(this.find('.js-syntax-highlight').get()); renderKroki(this.find('.js-render-kroki[hidden]').get()); renderMath(this.find('.js-render-math')); - if (gon.features?.sandboxedMermaid) { - renderSandboxedMermaid(this.find('.js-render-mermaid')); - } else { - renderMermaid(this.find('.js-render-mermaid')); - } + renderSandboxedMermaid(this.find('.js-render-mermaid')); + highlightCurrentUser(this.find('.gfm-project_member').get()); - initUserPopovers(this.find('.js-user-link').get()); - const mrPopoverElements = this.find('.gfm-merge_request').get(); - if (mrPopoverElements.length) { - import(/* webpackChunkName: 'MrPopoverBundle' */ '~/mr_popover') - .then(({ default: initMRPopovers }) => { - initMRPopovers(mrPopoverElements); + const issuablePopoverElements = this.find('.gfm-issue, .gfm-merge_request').get(); + if (issuablePopoverElements.length) { + import(/* webpackChunkName: 'IssuablePopoverBundle' */ '~/issuable/popover') + .then(({ default: initIssuablePopovers }) => { + initIssuablePopovers(issuablePopoverElements); }) .catch(() => {}); } |