Browse Source

Merge branch 'edge' into meteor-1.8

Lauri Ojansivu 6 years ago
parent
commit
0b018bfad5
5 changed files with 16 additions and 9 deletions
  1. 8 0
      CHANGELOG.md
  2. 1 1
      Stackerfile.yml
  3. 4 5
      client/components/cards/cardDetails.js
  4. 1 1
      package.json
  5. 2 2
      sandstorm-pkgdef.capnp

+ 8 - 0
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
 # v2.08 2019-01-28 Wekan release
 
 
 This release fixes the following bugs with Apache I-CLA, thanks to bentiss:
 This release fixes the following bugs with Apache I-CLA, thanks to bentiss:

+ 1 - 1
Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.08.0"
+appVersion: "v2.09.0"
 files:
 files:
   userUploads:
   userUploads:
     - README.md
     - README.md

+ 4 - 5
client/components/cards/cardDetails.js

@@ -78,14 +78,13 @@ BlazeComponent.extendComponent({
     //Scroll top
     //Scroll top
     const cardViewStartTop = $cardView.offset().top;
     const cardViewStartTop = $cardView.offset().top;
     const cardContainerScrollTop = $cardContainer.scrollTop();
     const cardContainerScrollTop = $cardContainer.scrollTop();
+
     let topOffset = false;
     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) {
     if(topOffset !== false) {
-      bodyBoardComponent.scrollTop(topOffset);
+      bodyBoardComponent.scrollTop(cardContainerScrollTop + topOffset);
     }
     }
 
 
   },
   },

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "wekan",
   "name": "wekan",
-  "version": "v2.08.0",
+  "version": "v2.09.0",
   "description": "Open-Source kanban",
   "description": "Open-Source kanban",
   "private": true,
   "private": true,
   "scripts": {
   "scripts": {

+ 2 - 2
sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
     # The name of the app as it is displayed to the user.
 
 
-    appVersion = 210,
+    appVersion = 211,
     # Increment this for every release.
     # 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.
     # Human-readable presentation of the app version.
 
 
     minUpgradableAppVersion = 0,
     minUpgradableAppVersion = 0,