diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-11-19 19:03:36 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-11-19 19:03:36 +0200 |
| commit | ee69eb03d4a72e8c67c377d8da3b169660cac67b (patch) | |
| tree | ebf921cc357204ca65de6f1b5a7aadd9b82669fc /client/components/cards/checklists.js | |
| parent | c040603786b513972b2b29bfe379b8f4a8b92792 (diff) | |
| parent | dfd0b2194746208c85b16fd485e7ca6f0cc34b57 (diff) | |
| download | wekan-ee69eb03d4a72e8c67c377d8da3b169660cac67b.tar.gz wekan-ee69eb03d4a72e8c67c377d8da3b169660cac67b.tar.bz2 wekan-ee69eb03d4a72e8c67c377d8da3b169660cac67b.zip | |
Merge branch 'devel'
Conflicts:
sandstorm-pkgdef.capnp
Diffstat (limited to 'client/components/cards/checklists.js')
| -rw-r--r-- | client/components/cards/checklists.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index 1cd77c9f..d3a946f0 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -146,8 +146,9 @@ BlazeComponent.extendComponent({ }, pressKey(event) { - //If user press enter key inside a form, submit it, so user doesn't have to leave keyboard to submit a form. - if (event.keyCode === 13) { + //If user press enter key inside a form, submit it + //Unless the user is also holding down the 'shift' key + if (event.keyCode === 13 && !event.shiftKey) { event.preventDefault(); const $form = $(event.currentTarget).closest('form'); $form.find('button[type=submit]').click(); |