diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/assets/javascripts/editor/extensions/editor_lite_extension_base.js | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/assets/javascripts/editor/extensions/editor_lite_extension_base.js')
-rw-r--r-- | app/assets/javascripts/editor/extensions/editor_lite_extension_base.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/assets/javascripts/editor/extensions/editor_lite_extension_base.js b/app/assets/javascripts/editor/extensions/editor_lite_extension_base.js index 3d4f08131c1..05a020bd958 100644 --- a/app/assets/javascripts/editor/extensions/editor_lite_extension_base.js +++ b/app/assets/javascripts/editor/extensions/editor_lite_extension_base.js @@ -1,4 +1,5 @@ import { Range } from 'monaco-editor'; +import { waitForCSSLoaded } from '~/helpers/startup_css_helper'; import { ERROR_INSTANCE_REQUIRED_FOR_EXTENSION, EDITOR_TYPE_CODE } from '../constants'; const hashRegexp = new RegExp('#?L', 'g'); @@ -23,11 +24,18 @@ export class EditorLiteExtension { if (instance.getEditorType && instance.getEditorType() === EDITOR_TYPE_CODE) { EditorLiteExtension.setupLineLinking(instance); } + EditorLiteExtension.deferRerender(instance); } else if (Object.entries(options).length) { throw new Error(ERROR_INSTANCE_REQUIRED_FOR_EXTENSION); } } + static deferRerender(instance) { + waitForCSSLoaded(() => { + instance.layout(); + }); + } + static highlightLines(instance) { const { hash } = window.location; if (!hash) { |