summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-10-03 17:46:00 +0300
committerLauri Ojansivu <x@xet7.org>2018-10-03 17:46:00 +0300
commit2206c5c84cdf8241e763fc23eceba26254de15e7 (patch)
tree4603710a695c2bfb398116c1708992ce47032478
parent5b8c642d8fb16e00000a1d92bcd3a5c6bbd07bce (diff)
downloadwekan-2206c5c84cdf8241e763fc23eceba26254de15e7.tar.gz
wekan-2206c5c84cdf8241e763fc23eceba26254de15e7.tar.bz2
wekan-2206c5c84cdf8241e763fc23eceba26254de15e7.zip
- Fix Card URL https://github.com/wekan/wekan/pull/1932/files
Thanks to schulz !
-rw-r--r--client/components/boards/boardBody.js7
-rw-r--r--client/components/cards/cardDetails.js20
-rwxr-xr-xclient/components/main/editor.js5
3 files changed, 30 insertions, 2 deletions
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index b68c9b12..ccbd0f23 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -147,6 +147,13 @@ BlazeComponent.extendComponent({
});
},
+ scrollTop(position = 0) {
+ const swimlanes = this.$('.js-swimlanes');
+ swimlanes && swimlanes.animate({
+ scrollTop: position,
+ });
+ },
+
}).register('boardBody');
BlazeComponent.extendComponent({
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({
diff --git a/client/components/main/editor.js b/client/components/main/editor.js
index 888fbe00..20ece562 100755
--- a/client/components/main/editor.js
+++ b/client/components/main/editor.js
@@ -38,7 +38,10 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
const view = this;
const currentBoard = Boards.findOne(Session.get('currentBoard'));
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;
});
const mentionRegex = /\B@([\w.]*)/gi;