diff options
author | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-09-11 09:05:28 -0400 |
---|---|---|
committer | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-09-11 09:05:28 -0400 |
commit | 0b52ba4ded6b4a92e2b9b9f8bc0c5c8248126579 (patch) | |
tree | 9388fde1b36d3f03b1e2d5cf7b67242a54c395f5 /client/components | |
parent | e0046032e865dca408ceb78d0afbdec723cb3e28 (diff) | |
parent | 6ce8eeee6c477cd39b684c47bf122b5872818ada (diff) | |
download | wekan-0b52ba4ded6b4a92e2b9b9f8bc0c5c8248126579.tar.gz wekan-0b52ba4ded6b4a92e2b9b9f8bc0c5c8248126579.tar.bz2 wekan-0b52ba4ded6b4a92e2b9b9f8bc0c5c8248126579.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'client/components')
-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); |