From 8a9a82fc8016163f4ad8ccc6edb0481613307749 Mon Sep 17 00:00:00 2001 From: hupptechnologies Date: Sat, 24 Nov 2018 16:30:12 +0530 Subject: [PATCH 1/6] Pull code --- .meteor/packages | 2 -- .meteor/versions | 3 --- 2 files changed, 5 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 3779a684b..4083d0c1d 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -87,5 +87,3 @@ momentjs:moment@2.22.2 browser-policy-framing mquandalle:moment msavin:usercache -wekan:wekan-ldap -wekan:accounts-cas diff --git a/.meteor/versions b/.meteor/versions index 6415eb8b2..8c5c1569b 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -179,7 +179,4 @@ useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 webapp@1.4.0 webapp-hashing@1.0.9 -wekan:accounts-cas@0.1.0 -wekan:wekan-ldap@0.0.2 -yasaricli:slugify@0.0.7 zimme:active-route@2.3.2 From 1bad6306416a0c0718a6b1717a7392726cb56472 Mon Sep 17 00:00:00 2001 From: hupptechnologies Date: Tue, 27 Nov 2018 12:57:03 +0530 Subject: [PATCH 2/6] autoamted local change --- .meteor/packages | 2 -- .meteor/versions | 3 --- client/components/cards/cardDetails.styl | 3 +++ client/components/cards/checklists.styl | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 3779a684b..4083d0c1d 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -87,5 +87,3 @@ momentjs:moment@2.22.2 browser-policy-framing mquandalle:moment msavin:usercache -wekan:wekan-ldap -wekan:accounts-cas diff --git a/.meteor/versions b/.meteor/versions index 6415eb8b2..8c5c1569b 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -179,7 +179,4 @@ useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 webapp@1.4.0 webapp-hashing@1.0.9 -wekan:accounts-cas@0.1.0 -wekan:wekan-ldap@0.0.2 -yasaricli:slugify@0.0.7 zimme:active-route@2.3.2 diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 1e290305b..66ecc22db 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -14,6 +14,9 @@ box-shadow: 0 0 7px 0 darken(white, 30%) transition: flex-basis 0.1s + .ps-scrollbar-y-rail + pointer-event: all + .card-details-canvas width: 470px diff --git a/client/components/cards/checklists.styl b/client/components/cards/checklists.styl index 70fb5007f..d48c18511 100644 --- a/client/components/cards/checklists.styl +++ b/client/components/cards/checklists.styl @@ -51,7 +51,6 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item padding-right: 3% z-index: 17 border-radius: 3px - top: 50% p position: relative From 0620fe5e111d50384ccca29afe8be5ddd3ee28bf Mon Sep 17 00:00:00 2001 From: hupptechnologies Date: Sat, 8 Dec 2018 17:53:26 +0530 Subject: [PATCH 3/6] Issue : Clicking the scrollbar closes the card on Chrome #1404 Resolved #1404 --- .meteor/packages | 3 +++ client/components/cards/cardDetails.js | 3 +++ client/components/cards/cardDetails.styl | 9 +++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 4083d0c1d..549b562f1 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -87,3 +87,6 @@ momentjs:moment@2.22.2 browser-policy-framing mquandalle:moment msavin:usercache +wekan:wekan-ldap +wekan:accounts-cas +maazalik:malihu-jquery-custom-scrollbar diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index da0f126a3..d28250580 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -112,6 +112,9 @@ BlazeComponent.extendComponent({ onRendered() { if (!Utils.isMiniScreen()) { Meteor.setTimeout(() => { + $(".card-details").mCustomScrollbar({ + theme:"minimal-dark", setWidth: false, setLeft: 0, scrollbarPosition: "outside", mouseWheel:true + }); this.scrollParentContainer(); }, 500); } diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 66ecc22db..1dc56f584 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -1,9 +1,9 @@ @import 'nib' .card-details - padding: 0 20px + padding: 0 flex-shrink: 0 - flex-basis: 470px + flex-basis: 510px will-change: flex-basis overflow-y: scroll overflow-x: hidden @@ -14,11 +14,16 @@ box-shadow: 0 0 7px 0 darken(white, 30%) transition: flex-basis 0.1s + .mCustomScrollBox + padding-left: 0 + .ps-scrollbar-y-rail pointer-event: all + position: absolute; .card-details-canvas width: 470px + padding-left: 20px; .card-details-header margin: 0 -20px 5px From 5ac69ed7dea94feea5cf58cb4b1df846b3fadd37 Mon Sep 17 00:00:00 2001 From: hupptechnologies Date: Sat, 8 Dec 2018 18:05:59 +0530 Subject: [PATCH 4/6] Fix lineter issue --- client/components/cards/cardDetails.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index d28250580..e17e74670 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -112,9 +112,7 @@ BlazeComponent.extendComponent({ onRendered() { if (!Utils.isMiniScreen()) { Meteor.setTimeout(() => { - $(".card-details").mCustomScrollbar({ - theme:"minimal-dark", setWidth: false, setLeft: 0, scrollbarPosition: "outside", mouseWheel:true - }); + $('.card-details').mCustomScrollbar({theme:'minimal-dark', setWidth: false, setLeft: 0, scrollbarPosition: 'outside', mouseWheel: true }); this.scrollParentContainer(); }, 500); } From bc35d9fe1a97d8643439966523d021818f49f315 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 9 Dec 2018 00:33:36 +0200 Subject: [PATCH 5/6] - Fix [Clicking the scrollbar closes the card on Chrome](https://github.com/wekan/wekan/issues/1404) by changing [mquandalle:perfect-scrollbar to malihu-jquery-custom-scrollbar](https://github.com/wekan/wekan/pull/2050). that works also when clicking scrollbar in Chrome. Also added back required packages that were removed in PR. Thanks to hupptechnologies and xet7 ! Closes #1404 --- .meteor/packages | 1 - .meteor/versions | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 549b562f1..2db7fe2d0 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -63,7 +63,6 @@ mousetrap:mousetrap mquandalle:jquery-textcomplete mquandalle:jquery-ui-drag-drop-sort mquandalle:mousetrap-bindglobal -mquandalle:perfect-scrollbar peerlibrary:blaze-components@=0.15.1 perak:markdown templates:tabs diff --git a/.meteor/versions b/.meteor/versions index 8c5c1569b..05948769e 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -82,6 +82,7 @@ launch-screen@1.1.1 livedata@1.0.18 localstorage@1.2.0 logging@1.1.19 +maazalik:malihu-jquery-custom-scrollbar@3.0.6 matb33:collection-hooks@0.8.4 matteodem:easy-search@1.6.4 mdg:validation-error@0.5.1 @@ -116,7 +117,6 @@ mquandalle:jquery-textcomplete@0.8.0_1 mquandalle:jquery-ui-drag-drop-sort@0.2.0 mquandalle:moment@1.0.1 mquandalle:mousetrap-bindglobal@0.0.1 -mquandalle:perfect-scrollbar@0.6.5_2 msavin:usercache@1.0.0 npm-bcrypt@0.9.3 npm-mongo@2.2.33 @@ -179,4 +179,7 @@ useraccounts:unstyled@1.14.2 verron:autosize@3.0.8 webapp@1.4.0 webapp-hashing@1.0.9 +wekan:accounts-cas@0.1.0 +wekan:wekan-ldap@0.0.2 +yasaricli:slugify@0.0.7 zimme:active-route@2.3.2 From 90208b774ab562fa683596935b966980899f61d8 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 9 Dec 2018 00:43:21 +0200 Subject: [PATCH 6/6] - Fix [Clicking the scrollbar closes the card on Chrome](https://github.com/wekan/wekan/issues/1404) by changing [mquandalle:perfect-scrollbar to malihu-jquery-custom-scrollbar](https://github.com/wekan/wekan/pull/2050). that works also when clicking scrollbar in Chrome. Also added back required packages that were removed in PR. Thanks to hupptechnologies and xet7 ! --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e78a6fcb..0bf91a1a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +- Fix [Clicking the scrollbar closes the card on Chrome](https://github.com/wekan/wekan/issues/1404) + by changing [mquandalle:perfect-scrollbar to malihu-jquery-custom-scrollbar](https://github.com/wekan/wekan/pull/2050). + that works also when clicking scrollbar in Chrome. Also added back required packages that were removed in PR. + +Thanks to GitHub users hupptechnologies and xet7 for their contributions. + # v1.84 2018-12-07 Wekan release This release fixes the following bugs: