diff options
| author | Akuket <32392661+Akuket@users.noreply.github.com> | 2018-10-09 14:49:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 14:49:12 +0200 |
| commit | 28a01862d04654784bd6010035c3a6fe1690ba60 (patch) | |
| tree | ee52d3c84b12f5ada9a3faf12925dd5806385a91 /client/components/cards | |
| parent | 3b4f285fea4a90ee96bfce855e1539adcec9b7aa (diff) | |
| parent | 58855ada97677d25475ba4721834c0f576ed3b47 (diff) | |
| download | wekan-28a01862d04654784bd6010035c3a6fe1690ba60.tar.gz wekan-28a01862d04654784bd6010035c3a6fe1690ba60.tar.bz2 wekan-28a01862d04654784bd6010035c3a6fe1690ba60.zip | |
Merge branch 'edge' into edge
Diffstat (limited to 'client/components/cards')
| -rw-r--r-- | client/components/cards/cardDetails.js | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 2cd399c1..da0f126a 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -69,6 +69,20 @@ BlazeComponent.extendComponent({ if (offset) { bodyBoardComponent.scrollLeft(cardContainerScroll + offset); } + + //Scroll top + const cardViewStartTop = $cardView.offset().top; + const cardContainerScrollTop = $cardContainer.scrollTop(); + let topOffset = false; + if(cardViewStartTop < 0){ + topOffset = 0; + } else if(cardViewStartTop - cardContainerScrollTop > 100) { + topOffset = cardViewStartTop - cardContainerScrollTop - 100; + } + if(topOffset !== false) { + bodyBoardComponent.scrollTop(topOffset); + } + }, presentParentTask() { @@ -96,7 +110,11 @@ BlazeComponent.extendComponent({ }, onRendered() { - if (!Utils.isMiniScreen()) this.scrollParentContainer(); + if (!Utils.isMiniScreen()) { + Meteor.setTimeout(() => { + this.scrollParentContainer(); + }, 500); + } const $checklistsDom = this.$('.card-checklist-items'); $checklistsDom.sortable({ |