Thanks to schulz !
This commit is contained in:
Lauri Ojansivu 2018-10-03 17:46:00 +03:00
parent 5b8c642d8f
commit 2206c5c84c
3 changed files with 30 additions and 2 deletions

View file

@ -147,6 +147,13 @@ BlazeComponent.extendComponent({
}); });
}, },
scrollTop(position = 0) {
const swimlanes = this.$('.js-swimlanes');
swimlanes && swimlanes.animate({
scrollTop: position,
});
},
}).register('boardBody'); }).register('boardBody');
BlazeComponent.extendComponent({ BlazeComponent.extendComponent({

View file

@ -69,6 +69,20 @@ BlazeComponent.extendComponent({
if (offset) { if (offset) {
bodyBoardComponent.scrollLeft(cardContainerScroll + 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() { presentParentTask() {
@ -96,7 +110,11 @@ BlazeComponent.extendComponent({
}, },
onRendered() { onRendered() {
if (!Utils.isMiniScreen()) this.scrollParentContainer(); if (!Utils.isMiniScreen()) {
Meteor.setTimeout(() => {
this.scrollParentContainer();
}, 500);
}
const $checklistsDom = this.$('.card-checklist-items'); const $checklistsDom = this.$('.card-checklist-items');
$checklistsDom.sortable({ $checklistsDom.sortable({

View file

@ -38,7 +38,10 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
const view = this; const view = this;
const currentBoard = Boards.findOne(Session.get('currentBoard')); const currentBoard = Boards.findOne(Session.get('currentBoard'));
const knowedUsers = currentBoard.members.map((member) => { const knowedUsers = currentBoard.members.map((member) => {
member.username = Users.findOne(member.userId).username; const u = Users.findOne(member.userId);
if(u){
member.username = u.username;
}
return member; return member;
}); });
const mentionRegex = /\B@([\w.]*)/gi; const mentionRegex = /\B@([\w.]*)/gi;