Merge branch 'hupptechnologies-scrollbar-closes-card-chrome' into devel

.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
@@ -89,3 +88,4 @@ mquandalle:moment
 msavin:usercache
 wekan:wekan-ldap
 wekan:accounts-cas
+maazalik:malihu-jquery-custom-scrollbar

.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

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:

client/components/cards/cardDetails.js

@@ -112,6 +112,7 @@ 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);
     }

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,8 +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

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