diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-01-28 18:31:26 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-01-28 18:31:26 +0200 |
commit | 0b018bfad5157975d803ef3205249c8b76cd4fb7 (patch) | |
tree | fe2aa83472ea37a11334a1b664c4c9e4b1859126 | |
parent | c360afb341a892a2e2516fdcb681f077efa86b0a (diff) | |
parent | 12cccc25cc07ef0706929873bf3409a82aa5ef13 (diff) | |
download | wekan-0b018bfad5157975d803ef3205249c8b76cd4fb7.tar.gz wekan-0b018bfad5157975d803ef3205249c8b76cd4fb7.tar.bz2 wekan-0b018bfad5157975d803ef3205249c8b76cd4fb7.zip |
Merge branch 'edge' into meteor-1.8
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | Stackerfile.yml | 2 | ||||
-rw-r--r-- | client/components/cards/cardDetails.js | 9 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
5 files changed, 16 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e435bfbb..74d75357 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v2.09 2019-01-28 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: diff --git a/Stackerfile.yml b/Stackerfile.yml index d3ae715e..d62c1b81 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/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 79a686a7..a571e21a 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); } }, diff --git a/package.json b/package.json index 939f2aff..57ee7f9e 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 59d13fcd..78c35eb5 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, |