diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 09:08:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 09:08:53 +0000 |
| commit | 764ff99273496e7d1da0dc9cc2255445cf7dc540 (patch) | |
| tree | eb359257b9eb9b1ab2ad3b75dd3f04b717889410 /app/assets/javascripts/content_editor | |
| parent | fdc5404bc3391e9a767b2a32422c082b9490c663 (diff) | |
| download | gitlab-ce-764ff99273496e7d1da0dc9cc2255445cf7dc540.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/content_editor')
| -rw-r--r-- | app/assets/javascripts/content_editor/components/content_editor.vue | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/content_editor/components/formatting_bubble_menu.vue | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/assets/javascripts/content_editor/components/content_editor.vue b/app/assets/javascripts/content_editor/components/content_editor.vue index a372233e543..02ab34447ca 100644 --- a/app/assets/javascripts/content_editor/components/content_editor.vue +++ b/app/assets/javascripts/content_editor/components/content_editor.vue @@ -100,11 +100,13 @@ export default { :class="{ 'is-focused': focused }" > <top-toolbar ref="toolbar" class="gl-mb-4" /> - <formatting-bubble-menu /> <div v-if="isLoadingContent" class="gl-w-full gl-display-flex gl-justify-content-center"> <gl-loading-icon size="sm" /> </div> - <tiptap-editor-content v-else class="md" :editor="contentEditor.tiptapEditor" /> + <template v-else> + <formatting-bubble-menu /> + <tiptap-editor-content class="md" :editor="contentEditor.tiptapEditor" /> + </template> </div> </div> </content-editor-provider> diff --git a/app/assets/javascripts/content_editor/components/formatting_bubble_menu.vue b/app/assets/javascripts/content_editor/components/formatting_bubble_menu.vue index 6c00480b87e..14a553ff30b 100644 --- a/app/assets/javascripts/content_editor/components/formatting_bubble_menu.vue +++ b/app/assets/javascripts/content_editor/components/formatting_bubble_menu.vue @@ -20,7 +20,11 @@ export default { }; </script> <template> - <bubble-menu class="gl-shadow gl-rounded-base" :editor="tiptapEditor"> + <bubble-menu + data-testid="formatting-bubble-menu" + class="gl-shadow gl-rounded-base" + :editor="tiptapEditor" + > <gl-button-group> <toolbar-button data-testid="bold" |