diff options
Diffstat (limited to 'app/assets/javascripts/behaviors')
6 files changed, 10 insertions, 17 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/gfm_auto_complete.js b/app/assets/javascripts/behaviors/markdown/gfm_auto_complete.js index d712c90242c..ff301a99243 100644 --- a/app/assets/javascripts/behaviors/markdown/gfm_auto_complete.js +++ b/app/assets/javascripts/behaviors/markdown/gfm_auto_complete.js @@ -11,6 +11,7 @@ export default function initGFMInput($els) { emojis: true, members: enableGFM, issues: enableGFM, + iterations: enableGFM, milestones: enableGFM, mergeRequests: enableGFM, labels: enableGFM, diff --git a/app/assets/javascripts/behaviors/markdown/init_gfm.js b/app/assets/javascripts/behaviors/markdown/init_gfm.js deleted file mode 100644 index d9c7cee50da..00000000000 --- a/app/assets/javascripts/behaviors/markdown/init_gfm.js +++ /dev/null @@ -1,13 +0,0 @@ -import $ from 'jquery'; -import { renderGFM } from '~/behaviors/markdown/render_gfm'; - -$.fn.renderGFM = function plugin() { - this.get().forEach(renderGFM); - return this; -}; -requestIdleCallback( - () => { - renderGFM(document.body); - }, - { timeout: 500 }, -); diff --git a/app/assets/javascripts/behaviors/markdown/render_gfm.js b/app/assets/javascripts/behaviors/markdown/render_gfm.js index 2eab5b84e3e..04b3599ea8c 100644 --- a/app/assets/javascripts/behaviors/markdown/render_gfm.js +++ b/app/assets/javascripts/behaviors/markdown/render_gfm.js @@ -18,6 +18,10 @@ function initPopovers(elements) { // Render GitLab flavoured Markdown export function renderGFM(element) { + if (!element) { + return; + } + const [ highlightEls, krokiEls, diff --git a/app/assets/javascripts/behaviors/preview_markdown.js b/app/assets/javascripts/behaviors/preview_markdown.js index 86a05f24dfc..32e395e4f3c 100644 --- a/app/assets/javascripts/behaviors/preview_markdown.js +++ b/app/assets/javascripts/behaviors/preview_markdown.js @@ -1,10 +1,10 @@ /* eslint-disable func-names */ import $ from 'jquery'; +import { renderGFM } from '~/behaviors/markdown/render_gfm'; import { createAlert } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { __ } from '~/locale'; -import '~/behaviors/markdown/init_gfm'; // MarkdownPreview // @@ -51,7 +51,7 @@ MarkdownPreview.prototype.showPreview = function ($form) { } preview.removeClass('md-preview-loading').html(body); - preview.renderGFM(); + renderGFM(preview.get(0)); this.renderReferencedUsers(response.references.users, $form); if (response.references.commands) { diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcut.vue b/app/assets/javascripts/behaviors/shortcuts/shortcut.vue index e5992779a99..38384157007 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcut.vue +++ b/app/assets/javascripts/behaviors/shortcuts/shortcut.vue @@ -1,4 +1,5 @@ <script> +import { getModifierKey } from '~/constants'; import { __, s__ } from '~/locale'; // Map some keys to their proper representation depending on the system @@ -22,7 +23,7 @@ const getKeyMap = () => { keyMap.alt = keyMap.option; // Mod is Command on Mac, and Ctrl on Windows/Linux - keyMap.mod = window.gl?.client?.isMac ? keyMap.command : keyMap.ctrl; + keyMap.mod = getModifierKey(true); return keyMap; }; diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js index e0ef49b60d3..7bb6bc7e9bc 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js @@ -71,7 +71,7 @@ export default class ShortcutsNavigation extends Shortcuts { iid: window.gl.mrWidgetData?.iid, }); if (path) { - visitUrl(path); + visitUrl(path, true); } } } |