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/cardDetails.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/cardDetails.js')
| -rw-r--r-- | client/components/cards/cardDetails.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 836a2353..3825bda8 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -197,7 +197,8 @@ Template.editCardTitleForm.onRendered(function () { Template.editCardTitleForm.events({ 'keydown .js-edit-card-title' (evt) { // If enter key was pressed, submit the data - if (evt.keyCode === 13) { + // Unless the shift key is also being pressed + if (evt.keyCode === 13 && !event.shiftKey) { $('.js-submit-edit-card-title-form').click(); } }, |