From 1cfe084cc29631ef0ae50611880a3bc8464999da Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Mon, 28 Jan 2019 16:13:34 +0100 Subject: [PATCH 1/3] automatic scroll: fix vertical automatic scrolling when opening a card We actually want the vertical scrolling to be fixed when opening the card details. I am not sure where the `100` value comes from, but this makes the scrolling happy on the swimlane view and on the lists view. --- client/components/cards/cardDetails.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 79a686a71..a571e21a1 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -78,14 +78,13 @@ BlazeComponent.extendComponent({ //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(cardViewStartTop !== 100){ + topOffset = cardViewStartTop - 100; } if(topOffset !== false) { - bodyBoardComponent.scrollTop(topOffset); + bodyBoardComponent.scrollTop(cardContainerScrollTop + topOffset); } }, From 34f62cb3b3781cdde47e67688b3a068c521f1de4 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 28 Jan 2019 18:23:28 +0200 Subject: [PATCH 2/3] - [Fix vertical automatic scrolling when opening a card](https://github.com/wekan/wekan/commit/820d3270935dc89f046144a7bbf2c8277e2484bc). Thanks to bentiss ! --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e435bfbb3..dceff875b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release fixes the following bugs with Apache I-CLA, thanks to bentiss: + +- [Fix vertical automatic scrolling when opening a card](https://github.com/wekan/wekan/commit/820d3270935dc89f046144a7bbf2c8277e2484bc). + +Thanks to GitHub user bentiss for contributions. + # v2.08 2019-01-28 Wekan release This release fixes the following bugs with Apache I-CLA, thanks to bentiss: From 12cccc25cc07ef0706929873bf3409a82aa5ef13 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 28 Jan 2019 18:29:46 +0200 Subject: [PATCH 3/3] v2.09 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dceff875b..74d753574 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v2.09 2019-01-28 Wekan release This release fixes the following bugs with Apache I-CLA, thanks to bentiss: diff --git a/Stackerfile.yml b/Stackerfile.yml index d3ae715ea..d62c1b81f 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.08.0" +appVersion: "v2.09.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 981e79616..a53ab1088 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.08.0", + "version": "v2.09.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 59d13fcd3..78c35eb58 100644 --- a/sandstorm-pkgdef.capnp +++ b/sandstorm-pkgdef.capnp @@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = ( appTitle = (defaultText = "Wekan"), # The name of the app as it is displayed to the user. - appVersion = 210, + appVersion = 211, # Increment this for every release. - appMarketingVersion = (defaultText = "2.08.0~2019-01-28"), + appMarketingVersion = (defaultText = "2.09.0~2019-01-28"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,