diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-27 16:54:35 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-27 16:54:35 +0000 |
| commit | 671be8a812dacb2a9d77ab8c4d59a1ee5468ead3 (patch) | |
| tree | bc2a93b839adc5ea1195391faaafe6369b8ebc0f | |
| parent | 7869e258f7630092e2ef1e8fb42168a006b7212e (diff) | |
| parent | 7a70fb123c0a21e1180665c9b28b8483d2c66a3e (diff) | |
| download | gitlab-ce-671be8a812dacb2a9d77ab8c4d59a1ee5468ead3.tar.gz | |
Merge branch 'ctrl-enter-multiple-comments' into 'master'
Prevent holding Control-Enter or Command-Enter from posting comment multiple times.
See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2184
See merge request !467
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 06b7413e616..04d889456dd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -46,6 +46,7 @@ v 7.10.0 (unreleased) - Refactor issue filtering - AJAX selectbox for issue assignee and author filters - Fix issue with missing options in issue filtering dropdown if selected one + - Prevent holding Control-Enter or Command-Enter from posting comment multiple times. v 7.9.0 - Send EmailsOnPush email when branch or tag is created or deleted. diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index c366c98cf54..b61c4dd6544 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -57,6 +57,7 @@ class @Notes @notes_forms = '.js-main-target-form textarea, .js-discussion-note-form textarea' # Chrome doesn't fire keypress or keyup for Command+Enter, so we need keydown. $(document).on('keydown', @notes_forms, (e) -> + return if e.originalEvent.repeat if e.keyCode == 10 || ((e.metaKey || e.ctrlKey) && e.keyCode == 13) $(@).parents('form').submit() ) |