diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-19 00:10:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-19 00:10:06 +0300 |
commit | cb0a625459525122d2736a895a728edb3b8ea4ff (patch) | |
tree | a3a830de41cdc0eb71c380f8e751faa1410a724a /app/assets/javascripts/blob | |
parent | dd6e32bf47776514b8fe2abcfe7998503f16baab (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/blob')
-rw-r--r-- | app/assets/javascripts/blob/components/blob_edit_content.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/blob/utils.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/blob/components/blob_edit_content.vue b/app/assets/javascripts/blob/components/blob_edit_content.vue index 73ccc3289b9..0e670bbd80a 100644 --- a/app/assets/javascripts/blob/components/blob_edit_content.vue +++ b/app/assets/javascripts/blob/components/blob_edit_content.vue @@ -1,6 +1,6 @@ <script> import { debounce } from 'lodash'; -import { initEditorLite } from '~/blob/utils'; +import { initSourceEditor } from '~/blob/utils'; import { SNIPPET_MEASURE_BLOBS_CONTENT } from '~/performance/constants'; import eventHub from './eventhub'; @@ -36,7 +36,7 @@ export default { }, }, mounted() { - this.editor = initEditorLite({ + this.editor = initSourceEditor({ el: this.$refs.editor, blobPath: this.fileName, blobContent: this.value, diff --git a/app/assets/javascripts/blob/utils.js b/app/assets/javascripts/blob/utils.js index 8043c0bbc07..bbc061dd36e 100644 --- a/app/assets/javascripts/blob/utils.js +++ b/app/assets/javascripts/blob/utils.js @@ -1,6 +1,6 @@ -import Editor from '~/editor/editor_lite'; +import Editor from '~/editor/source_editor'; -export function initEditorLite({ el, ...args }) { +export function initSourceEditor({ el, ...args }) { const editor = new Editor({ scrollbar: { alwaysConsumeMouseWheel: false, |