Commit 549ee8ad authored by Phil Hughes's avatar Phil Hughes

Merge branch '8535-add-mr-comment-on-ctrl-enter' into 'master'

Resolve "Ctrl+Enter immediately adds MR comment"

See merge request gitlab-org/gitlab-ce!24053
parents f309e199 98ad22d2
......@@ -149,6 +149,9 @@ export default {
return shouldResolve || shouldToggleState;
},
handleKeySubmit() {
this.handleUpdate();
},
handleUpdate(shouldResolve) {
const beforeSubmitDiscussionState = this.discussionResolved;
this.isSubmitting = true;
......@@ -216,8 +219,8 @@ export default {
class="note-textarea js-gfm-input js-note-text js-autosize markdown-area js-vue-issue-note-form js-vue-textarea qa-reply-input"
aria-label="Description"
placeholder="Write a comment or drag your files here…"
@keydown.meta.enter="handleUpdate();"
@keydown.ctrl.enter="handleUpdate();"
@keydown.meta.enter="handleKeySubmit();"
@keydown.ctrl.enter="handleKeySubmit();"
@keydown.up="editMyLastNote();"
@keydown.esc="cancelHandler(true);"
></textarea>
......
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