diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-22 01:39:23 +0000 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-26 11:43:10 +0200 |
| commit | f91668eca7c0897f0545488a1ded177fef8474ee (patch) | |
| tree | 8a5c566a954c7c9955f7d4d7a1b93012b6b09445 | |
| parent | 965792dc1ec7482ac6e7ff0d6006db814ef16061 (diff) | |
| download | gitlab-ce-f91668eca7c0897f0545488a1ded177fef8474ee.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 419d6225d8e..fa7ac994058 100644 --- a/app/assets/javascripts/notes/components/issue_comment_form.vue +++ b/app/assets/javascripts/notes/components/issue_comment_form.vue @@ -182,6 +182,7 @@ if (shouldClear) { this.note = ''; this.resizeTextarea(); + this.$refs.markdownField.previewMarkdown = false; } // reset autostave @@ -260,7 +261,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]" |