diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-04 20:29:04 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-04 20:29:04 +0000 |
| commit | ec68d673b24687804b1e1aa4c86b2f8fbc9ba7fd (patch) | |
| tree | e89f1a1882278c4e73af73667f26b4627222e47d | |
| parent | cb73470b933088721dbfa63840f191307a79a394 (diff) | |
| parent | 692773c5a0a8e203442e119b57ae32adf25de67e (diff) | |
| download | gitlab-ce-ec68d673b24687804b1e1aa4c86b2f8fbc9ba7fd.tar.gz | |
Merge branch 'ctr-enter-textarea-mac' into 'master'
ctrl+enter on mac correctly submits forms
Closes #4177
See merge request !3089
| -rw-r--r-- | app/assets/javascripts/behaviors/quick_submit.js.coffee | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/javascripts/behaviors/quick_submit.js.coffee b/app/assets/javascripts/behaviors/quick_submit.js.coffee index 61c2e4f698c..6e29d374267 100644 --- a/app/assets/javascripts/behaviors/quick_submit.js.coffee +++ b/app/assets/javascripts/behaviors/quick_submit.js.coffee @@ -24,10 +24,7 @@ keyCodeIs = (e, keyCode) -> $(document).on 'keydown.quick_submit', '.js-quick-submit', (e) -> return unless keyCodeIs(e, 13) # Enter - if isMac() - return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey) - else - return unless (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey) + return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey) || (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey) e.preventDefault() |