diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2018-01-17 17:58:17 -0500 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2018-01-17 17:58:17 -0500 |
commit | c3357a10e79115a68672e7d6135acaeda5b1c6b3 (patch) | |
tree | ada525d66d7e2bcd3f2c70bbc0cb249185f029ec | |
parent | e23735d70e2cf299f996d7e8d6d4f83c39ba28d5 (diff) | |
download | gitlab-ce-markdown-wysiwyg.tar.gz |
get into comment formmarkdown-wysiwyg
-rw-r--r-- | app/assets/javascripts/notes/components/comment_form.vue | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index 14c8b561551..bcf3a88560c 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -23,6 +23,7 @@ discussionLockedWidget, markdownField, userAvatarLink, + quill, }, mixins: [ issuableStateMixin, @@ -293,13 +294,6 @@ Please check your network connection and try again.`; :quick-actions-docs-path="quickActionsDocsPath" :add-spacing-classes="false" ref="markdownField"> - <quill placeholder="this is good" :toolbar="[['bold', 'underline']]" @change="textChanged" slow="wysiwyg"> - <div slot="content"> - <p>Hello World!</p> - <p>Some initial <strong>bold</strong> text</p> - <p><br></p> - </div> - </quill> <textarea id="note-body" name="note[note]" @@ -316,6 +310,14 @@ js-gfm-input js-autosize markdown-area js-vue-textarea" @keydown.meta.enter="handleSave()" @keydown.ctrl.enter="handleSave()"> </textarea> + + <quill placeholder="this is good" :toolbar="[['bold', 'underline']]" @change="textChanged" slot="wysiwyg"> + <div slot="content"> + <p>Hello World!</p> + <p>Some initial <strong>bold</strong> text</p> + <p><br></p> + </div> + </quill> </markdown-field> <div class="note-form-actions"> <div |