diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-11 21:56:44 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-11 21:56:44 +0000 |
| commit | d1ad5b5378a1becb7bbd63b3263b30c205302983 (patch) | |
| tree | 0cd9a8e32cb443c9db7113afee1bce6e13e0f0ab | |
| parent | 2dfd21983483bd5fd32b327edb4b02228b377c47 (diff) | |
| parent | d909ae73dc5bca391e6639af0d8f9fcacb7a00ea (diff) | |
| download | gitlab-ce-d1ad5b5378a1becb7bbd63b3263b30c205302983.tar.gz | |
Merge branch 'fix-command-enter' into 'master'
Actually submit comment on command-enter.
Resolves #1869.
Because !1474 didn't actually work.
cc @sytse
See merge request !1499
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 37a7b31d3c8..47c5ecdedf1 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -58,7 +58,8 @@ class @Notes $(document).on "visibilitychange", @visibilityChange @notes_forms = '.js-main-target-form textarea, .js-discussion-note-form textarea' - $(document).on('keypress', @notes_forms, (e)-> + # Chrome doesn't fire keypress or keyup for Command+Enter, so we need keydown. + $(document).on('keydown', @notes_forms, (e) -> if e.keyCode == 10 || ((e.metaKey || e.ctrlKey) && e.keyCode == 13) $(@).parents('form').submit() ) |