diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-30 15:08:23 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-30 15:08:23 +0300 |
commit | f1284938edfc2e033baf2c26ebadf42c526f6432 (patch) | |
tree | 1537dfd31ad896605914c9e5aa57351d67260b1f /app/assets/javascripts/ide | |
parent | bf774d67fc8a84f76f20494c318d7cfacb0c69ac (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide')
-rw-r--r-- | app/assets/javascripts/ide/components/repo_editor.vue | 26 | ||||
-rw-r--r-- | app/assets/javascripts/ide/lib/editor_options.js | 1 |
2 files changed, 1 insertions, 26 deletions
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue index f14d86114b8..880272752b5 100644 --- a/app/assets/javascripts/ide/components/repo_editor.vue +++ b/app/assets/javascripts/ide/components/repo_editor.vue @@ -192,23 +192,6 @@ export default { this.createEditorInstance(); } }, - panelResizing() { - if (!this.panelResizing) { - this.refreshEditorDimensions(); - } - }, - showTabs() { - this.$nextTick(() => this.refreshEditorDimensions()); - }, - rightPaneIsOpen() { - this.refreshEditorDimensions(); - }, - showEditor(val) { - if (val) { - // We need to wait for the editor to actually be rendered. - this.$nextTick(() => this.refreshEditorDimensions()); - } - }, showContentViewer(val) { if (!val) return; @@ -396,10 +379,6 @@ export default { fileLanguage: this.model.language, }); - this.$nextTick(() => { - this.editor.updateDimensions(); - }); - this.$emit('editorSetup'); if (performance.getEntriesByName(WEBIDE_MARK_FILE_CLICKED).length) { eventHub.$emit(WEBIDE_MEASURE_FILE_AFTER_INTERACTION); @@ -415,11 +394,6 @@ export default { }); } }, - refreshEditorDimensions() { - if (this.showEditor && this.editor) { - this.editor.updateDimensions(); - } - }, fetchEditorconfigRules() { return getRulesWithTraversal(this.file.path, (path) => { const entry = this.entries[path]; diff --git a/app/assets/javascripts/ide/lib/editor_options.js b/app/assets/javascripts/ide/lib/editor_options.js index 52da9942efe..525afcb2083 100644 --- a/app/assets/javascripts/ide/lib/editor_options.js +++ b/app/assets/javascripts/ide/lib/editor_options.js @@ -8,6 +8,7 @@ export const defaultEditorOptions = { }, wordWrap: 'on', glyphMargin: true, + automaticLayout: true, }; export const defaultDiffOptions = { |