diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-22 01:39:23 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-09-22 01:39:23 +0000 |
commit | bc33774f5227c2a8ca7dbc04c5a6a88bd5abdbc9 (patch) | |
tree | 95dcd862c7efc86a5c80665a7fb23f83643badab | |
parent | 92173ac55cd921a65ce137e238ed8bc4474aaccb (diff) | |
parent | 66da536a061d445c3a01613949ac844113b460df (diff) | |
download | gitlab-ce-bc33774f5227c2a8ca7dbc04c5a6a88bd5abdbc9.tar.gz |
Merge branch 'acet-switch-markdown-pane' into 'master'
IssueNotes: Switch back to Write pane when note cancel or submit.
Closes #37907
See merge request gitlab-org/gitlab-ce!14402
-rw-r--r-- | app/assets/javascripts/notes/components/issue_comment_form.vue | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/issue_comment_form.vue b/app/assets/javascripts/notes/components/issue_comment_form.vue index 183d8e5aa38..8a485a54271 100644 --- a/app/assets/javascripts/notes/components/issue_comment_form.vue +++ b/app/assets/javascripts/notes/components/issue_comment_form.vue @@ -177,6 +177,7 @@ if (shouldClear) { this.note = ''; this.resizeTextarea(); + this.$refs.markdownField.previewMarkdown = false; } // reset autostave @@ -255,7 +256,8 @@ :markdown-docs-path="markdownDocsPath" :quick-actions-docs-path="quickActionsDocsPath" :add-spacing-classes="false" - :is-confidential-issue="isConfidentialIssue"> + :is-confidential-issue="isConfidentialIssue" + ref="markdownField"> <textarea id="note-body" name="note[note]" |