diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-11-18 23:31:00 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-11-18 23:31:00 +0200 |
| commit | 13d8e75c05cf8ed90c4b5d8ee5aadad0f9444b8f (patch) | |
| tree | f6adf1888e052aaf639794c4e5fe314254a6a850 /client/components/cards/checklists.js | |
| parent | ba3c3f8289534fed7b1525821fbf0d2fd3bd5ec2 (diff) | |
| parent | 8ae9cb97f7e32a4ede4b0e5c10c10b218a58b4d4 (diff) | |
| download | wekan-13d8e75c05cf8ed90c4b5d8ee5aadad0f9444b8f.tar.gz wekan-13d8e75c05cf8ed90c4b5d8ee5aadad0f9444b8f.tar.bz2 wekan-13d8e75c05cf8ed90c4b5d8ee5aadad0f9444b8f.zip | |
Merge branch 'brooksbecton-addMarkdownToTitle' into devel
Markdown in card/minicard/checlist titles
and checklist items. Next line: Shift+Enter. Submit: Enter. Closes #926.
Fix: Emoji detection breaks MAC addresses. Closes #1248.
Fix: Codeblocks should not be scanned for emoji. Closes #643.
Fix: Whitespace trimming breaks Markdown code block indentation. Closes #1288.
Thanks to brooksbecton !
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(); |