diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /app/assets/javascripts/vue_shared/components/blob_viewers | |
parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/blob_viewers')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js | 5 | ||||
-rw-r--r-- | app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue | 15 |
2 files changed, 7 insertions, 13 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 0c1d55ae707..4cab5e964de 100644 --- a/app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js +++ b/app/assets/javascripts/vue_shared/components/blob_viewers/mixins.js @@ -27,6 +27,11 @@ export default { required: false, default: '', }, + hideLineNumbers: { + type: Boolean, + required: false, + default: false, + }, }, mounted() { eventHub.$emit(SNIPPET_MEASURE_BLOBS_CONTENT); diff --git a/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue b/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue index 84770dbac6f..40044e518c3 100644 --- a/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue +++ b/app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue @@ -8,8 +8,6 @@ export default { name: 'SimpleViewer', components: { GlIcon, - SourceEditor: () => - import(/* webpackChunkName: 'SourceEditor' */ '~/vue_shared/components/source_editor.vue'), }, mixins: [ViewerMixin, glFeatureFlagsMixin()], inject: ['blobHash'], @@ -22,9 +20,6 @@ export default { lineNumbers() { return this.content.split('\n').length; }, - refactorBlobViewerEnabled() { - return this.glFeatures.refactorBlobViewer; - }, }, mounted() { const { hash } = window.location; @@ -52,14 +47,8 @@ export default { </script> <template> <div> - <source-editor - v-if="isRawContent && refactorBlobViewerEnabled" - :value="content" - :file-name="fileName" - :editor-options="{ readOnly: true }" - /> - <div v-else class="file-content code js-syntax-highlight" :class="$options.userColorScheme"> - <div class="line-numbers"> + <div class="file-content code js-syntax-highlight" :class="$options.userColorScheme"> + <div v-if="!hideLineNumbers" class="line-numbers"> <a v-for="line in lineNumbers" :id="`L${line}`" |