diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/code_navigation | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/code_navigation')
-rw-r--r-- | app/assets/javascripts/code_navigation/components/doc_line.vue | 22 | ||||
-rw-r--r-- | app/assets/javascripts/code_navigation/components/popover.vue | 5 |
2 files changed, 25 insertions, 2 deletions
diff --git a/app/assets/javascripts/code_navigation/components/doc_line.vue b/app/assets/javascripts/code_navigation/components/doc_line.vue new file mode 100644 index 00000000000..69d398893d9 --- /dev/null +++ b/app/assets/javascripts/code_navigation/components/doc_line.vue @@ -0,0 +1,22 @@ +<script> +export default { + props: { + language: { + type: String, + required: true, + }, + tokens: { + type: Array, + required: true, + }, + }, +}; +</script> + +<template> + <span class="line" :lang="language"> + <span v-for="(token, tokenIndex) in tokens" :key="tokenIndex" :class="token.class">{{ + token.value + }}</span> + </span> +</template> diff --git a/app/assets/javascripts/code_navigation/components/popover.vue b/app/assets/javascripts/code_navigation/components/popover.vue index 7147ce227e8..df5f89e4faf 100644 --- a/app/assets/javascripts/code_navigation/components/popover.vue +++ b/app/assets/javascripts/code_navigation/components/popover.vue @@ -1,9 +1,11 @@ <script> import { GlButton } from '@gitlab/ui'; +import DocLine from './doc_line.vue'; export default { components: { GlButton, + DocLine, }, props: { position: { @@ -83,8 +85,7 @@ export default { ref="code-output" :class="$options.colorScheme" class="border-0 bg-transparent m-0 code highlight" - v-html="hover.value" - ></pre> + ><doc-line v-for="(tokens, tokenIndex) in hover.tokens" :key="tokenIndex" :language="hover.language" :tokens="tokens"/></pre> <p v-else ref="doc-output" class="p-3 m-0"> {{ hover.value }} </p> |