diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-13 03:07:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-13 03:07:19 +0300 |
commit | 4df596fc09ef7838d439673f5740993e294c4cd6 (patch) | |
tree | 8431c7d25cd0dfc701905f3d445c273c98d824ed /app/assets/javascripts/vue_shared/components/markdown | |
parent | 46c0957d59e2b88b97e6545cb470718869068b13 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/markdown')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/markdown/header.vue | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue index 89fffdedbfd..e83441e59a2 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue @@ -10,6 +10,7 @@ import { INDENT_LINE, OUTDENT_LINE, } from '~/behaviors/shortcuts/keybindings'; +import { getModifierKey } from '~/constants'; import { getSelectedFragment } from '~/lib/utils/common_utils'; import { s__, __ } from '~/locale'; import { CopyAsGFM } from '~/behaviors/markdown/copy_as_gfm'; @@ -66,6 +67,7 @@ export default { return { tag: '> ', suggestPopoverVisible: false, + modifierKey: getModifierKey(), }; }, computed: { @@ -90,15 +92,6 @@ export default { const expandText = s__('MarkdownEditor|Click to expand'); return [`<details><summary>${expandText}</summary>`, `{text}`, '</details>'].join('\n'); }, - isMac() { - // Accessing properties using ?. to allow tests to use - // this component without setting up window.gl.client. - // In production, window.gl.client should always be present. - return Boolean(window.gl?.client?.isMac); - }, - modifierKey() { - return this.isMac ? '⌘' : s__('KeyboardKey|Ctrl+'); - }, }, watch: { showSuggestPopover() { |