diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-16 15:08:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-16 15:08:27 +0300 |
| commit | 377d420e3d7e3f066c409714cbb9f7bb0a4882b6 (patch) | |
| tree | 4ba0cb1b9487bf386c3c0e5d76a2191f285b6243 /app/assets/javascripts/notes | |
| parent | bc9b43904d491c7b864c8fb6ba06ae0f6625db0d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_body.vue | 5 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/components/note_body.vue b/app/assets/javascripts/notes/components/note_body.vue index 7aa86864e03..20cf21cd1b6 100644 --- a/app/assets/javascripts/notes/components/note_body.vue +++ b/app/assets/javascripts/notes/components/note_body.vue @@ -1,11 +1,10 @@ <script> -import $ from 'jquery'; import { escape } from 'lodash'; import { mapActions, mapGetters, mapState } from 'vuex'; import SafeHtml from '~/vue_shared/directives/safe_html'; import { __ } from '~/locale'; -import '~/behaviors/markdown/render_gfm'; import Suggestions from '~/vue_shared/components/markdown/suggestions.vue'; +import { renderGFM } from '~/behaviors/markdown/render_gfm'; import autosave from '../mixins/autosave'; import NoteAttachment from './note_attachment.vue'; import NoteAwardsList from './note_awards_list.vue'; @@ -121,7 +120,7 @@ export default { 'removeSuggestionInfoFromBatch', ]), renderGFM() { - $(this.$refs['note-body']).renderGFM(); + renderGFM(this.$refs['note-body']); }, handleFormUpdate(noteText, parentElement, callback, resolveDiscussion) { this.$emit('handleFormUpdate', { noteText, parentElement, callback, resolveDiscussion }); diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 99809013bf6..7a73278bf7b 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -12,6 +12,7 @@ import { ignoreWhilePending } from '~/lib/utils/ignore_while_pending'; import { truncateSha } from '~/lib/utils/text_utility'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import { __, s__, sprintf } from '~/locale'; +import { renderGFM } from '~/behaviors/markdown/render_gfm'; import eventHub from '../event_hub'; import noteable from '../mixins/noteable'; import resolvable from '../mixins/resolvable'; @@ -287,7 +288,7 @@ export default { this.isEditing = false; this.isRequesting = false; this.oldContent = null; - $(this.$refs.noteBody.$el).renderGFM(); + renderGFM(this.$refs.noteBody.$el); this.$refs.noteBody.resetAutoSave(); this.$emit('updateSuccess'); }, |