Commit bc33774f authored by Jacob Schatz's avatar Jacob Schatz

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
parents 92173ac5 66da536a
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
if (shouldClear) { if (shouldClear) {
this.note = ''; this.note = '';
this.resizeTextarea(); this.resizeTextarea();
this.$refs.markdownField.previewMarkdown = false;
} }
// reset autostave // reset autostave
...@@ -255,7 +256,8 @@ ...@@ -255,7 +256,8 @@
:markdown-docs-path="markdownDocsPath" :markdown-docs-path="markdownDocsPath"
:quick-actions-docs-path="quickActionsDocsPath" :quick-actions-docs-path="quickActionsDocsPath"
:add-spacing-classes="false" :add-spacing-classes="false"
:is-confidential-issue="isConfidentialIssue"> :is-confidential-issue="isConfidentialIssue"
ref="markdownField">
<textarea <textarea
id="note-body" id="note-body"
name="note[note]" name="note[note]"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment