diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-09-07 22:33:20 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-07 22:33:20 +0300 |
commit | 11d6b77bb117ae0f16b05a7daf37a0276c32e891 (patch) | |
tree | 23425dcbecd84eccac9e9ad50c247d1ea2aa6588 | |
parent | f248dada3fd910722868c7b4614b2a8cc548a30a (diff) | |
parent | 74b5bdf2aa66a2b4ea94d4ecbd7f5f63eaf1f5eb (diff) | |
download | wekan-11d6b77bb117ae0f16b05a7daf37a0276c32e891.tar.gz wekan-11d6b77bb117ae0f16b05a7daf37a0276c32e891.tar.bz2 wekan-11d6b77bb117ae0f16b05a7daf37a0276c32e891.zip |
Merge pull request #2690 from justinr1234/fix-drag-select-on-card-details
Fix #2451 unable to drag select text without closing card details
-rw-r--r-- | client/components/cards/cardDetails.js | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index cd8813f5..47941560 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -321,6 +321,19 @@ BlazeComponent.extendComponent({ parentComponent.showOverlay.set(true); parentComponent.mouseHasEnterCardDetails = true; }, + 'mousedown .js-card-details'() { + Session.set('cardDetailsIsDragging', false); + Session.set('cardDetailsIsMouseDown', true); + }, + 'mousemove .js-card-details'() { + if (Session.get('cardDetailsIsMouseDown')) { + Session.set('cardDetailsIsDragging', true); + } + }, + 'mouseup .js-card-details'() { + Session.set('cardDetailsIsDragging', false); + Session.set('cardDetailsIsMouseDown', false); + }, 'click #toggleButton'() { Meteor.call('toggleSystemMessages'); }, @@ -777,7 +790,14 @@ BlazeComponent.extendComponent({ EscapeActions.register( 'detailsPane', () => { - Utils.goBoardId(Session.get('currentBoard')); + if (Session.get('cardDetailsIsDragging')) { + // Reset dragging status as the mouse landed outside the cardDetails template area and this will prevent a mousedown event from firing + Session.set('cardDetailsIsDragging', false); + Session.set('cardDetailsIsMouseDown', false); + } else { + // Prevent close card when the user is selecting text and moves the mouse cursor outside the card detail area + Utils.goBoardId(Session.get('currentBoard')); + } }, () => { return !Session.equals('currentCard', null); |