diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 15:08:09 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 15:08:09 +0000 |
| commit | d3fc3be040a4fed2328e23ef28696dd8bd8238b4 (patch) | |
| tree | f1874ea5e6e3c50c6a3c2ca2900af4ae73a53119 /app/assets/javascripts/vue_shared/components/blob_viewers | |
| parent | c6c7437861bff9572747674095c4dfbdfbea4988 (diff) | |
| download | gitlab-ce-d3fc3be040a4fed2328e23ef28696dd8bd8238b4.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/blob_viewers')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js b/app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js index 582213ee8d3..27f1a4f75d5 100644 --- a/app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js +++ b/app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js @@ -4,5 +4,9 @@ export default { type: String, required: true, }, + type: { + type: String, + required: true, + }, }, }; diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue b/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue index b3a1df8f303..afbfb1e0ee2 100644 --- a/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/blob_viewers/rich_viewer.vue @@ -1,10 +1,14 @@ <script> import ViewerMixin from './mixins'; +import { handleBlobRichViewer } from '~/blob/viewer'; export default { mixins: [ViewerMixin], + mounted() { + handleBlobRichViewer(this.$refs.content, this.type); + }, }; </script> <template> - <div v-html="content"></div> + <div ref="content" v-html="content"></div> </template> |