summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-11-21 09:30:58 +0200
committerLauri Ojansivu <x@xet7.org>2017-11-21 09:30:58 +0200
commitf3e7646cfa065ceea0cf1aaff1f5adbde457a32a (patch)
tree48dab92c101cec85269eaf86f251e1f278039a6f
parentc8cef7551f9978829692a31fce8c50fe13950c37 (diff)
parent552fa32b87e0241e44fc2636f76b2fecfce89226 (diff)
downloadwekan-f3e7646cfa065ceea0cf1aaff1f5adbde457a32a.tar.gz
wekan-f3e7646cfa065ceea0cf1aaff1f5adbde457a32a.tar.bz2
wekan-f3e7646cfa065ceea0cf1aaff1f5adbde457a32a.zip
Merge branch 'couscous3-fix-title-editing-shift-key-firefox' into devel
Card details: fix title editing with shift key. Thanks to couscous3 !
-rw-r--r--CHANGELOG.md3
-rw-r--r--client/components/cards/cardDetails.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f269401..0593a080 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,8 @@ This release adds the following new features:
and fixes the following bugs:
* [Board list with long-description boards not visible](https://github.com/wekan/wekan/pull/1346);
-* [Remove erroneous minicard title whitespace](https://github.com/wekan/wekan/pull/1347).
+* [Remove erroneous minicard title whitespace](https://github.com/wekan/wekan/pull/1347);
+* [Card details: fix title editing with shift key](https://github.com/wekan/wekan/pull/1348).
Thanks to GitHub users couscous3, GhassenRjab and thuanpq for their contributions.
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index f13404a5..c5b2fcdc 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -200,7 +200,7 @@ Template.editCardTitleForm.events({
'keydown .js-edit-card-title' (evt) {
// If enter key was pressed, submit the data
// Unless the shift key is also being pressed
- if (evt.keyCode === 13 && !event.shiftKey) {
+ if (evt.keyCode === 13 && !evt.shiftKey) {
$('.js-submit-edit-card-title-form').click();
}
},