diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-11-19 14:09:36 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-11-19 14:09:36 +0200 |
commit | 351d4767d7e93c90ac798769d6071da8730d834f (patch) | |
tree | 47b9e49342f17affce947c840566b9c03a630aab /client/components/swimlanes/swimlanes.js | |
parent | f595120e7203fdeee1a6c899adb948807e84b672 (diff) | |
download | wekan-351d4767d7e93c90ac798769d6071da8730d834f.tar.gz wekan-351d4767d7e93c90ac798769d6071da8730d834f.tar.bz2 wekan-351d4767d7e93c90ac798769d6071da8730d834f.zip |
When logged in, use database for setting, so that changes are
immediate. Only on public board use cookies.
Comment out Collapse CSS that is not in use.
Thanks to xet7 !
Diffstat (limited to 'client/components/swimlanes/swimlanes.js')
-rw-r--r-- | client/components/swimlanes/swimlanes.js | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 1bb522e5..cad673aa 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -99,7 +99,21 @@ function initSortable(boardComponent, $listsDom) { boardComponent.autorun(() => { import { Cookies } from 'meteor/ostrio:cookies'; const cookies = new Cookies(); - if (!Utils.isMiniScreen() && cookies.has('showDesktopDragHandles')) { + let showDesktopDragHandles = false; + currentUser = Meteor.user(); + if (currentUser) { + showDesktopDragHandles = (currentUser.profile || {}).showDesktopDragHandles; + } else { + import { Cookies } from 'meteor/ostrio:cookies'; + const cookies = new Cookies(); + if (cookies.has('showDesktopDragHandles')) { + showDesktopDragHandles = true; + } else { + showDesktopDragHandles = false; + } + } + + if (!Utils.isMiniScreen() && showDesktopDragHandles) { $listsDom.sortable({ handle: '.js-list-handle', }); @@ -186,10 +200,23 @@ BlazeComponent.extendComponent({ import { Cookies } from 'meteor/ostrio:cookies'; const cookies = new Cookies(); + let showDesktopDragHandles = false; + currentUser = Meteor.user(); + if (currentUser) { + showDesktopDragHandles = (currentUser.profile || {}).showDesktopDragHandles; + } else { + import { Cookies } from 'meteor/ostrio:cookies'; + const cookies = new Cookies(); + if (cookies.has('showDesktopDragHandles')) { + showDesktopDragHandles = true; + } else { + showDesktopDragHandles = false; + } + } const noDragInside = ['a', 'input', 'textarea', 'p'].concat( Utils.isMiniScreen() || - (!Utils.isMiniScreen() && cookies.has('showDesktopDragHandles')) + (!Utils.isMiniScreen() && showDesktopDragHandles) ? ['.js-list-handle', '.js-swimlane-header-handle'] : ['.js-list-header'], ); @@ -270,12 +297,17 @@ BlazeComponent.extendComponent({ Template.swimlane.helpers({ showDesktopDragHandles() { - import { Cookies } from 'meteor/ostrio:cookies'; - const cookies = new Cookies(); - if (cookies.has('showDesktopDragHandles')) { - return true; + currentUser = Meteor.user(); + if (currentUser) { + return (currentUser.profile || {}).showDesktopDragHandles; } else { - return false; + import { Cookies } from 'meteor/ostrio:cookies'; + const cookies = new Cookies(); + if (cookies.has('showDesktopDragHandles')) { + return true; + } else { + return false; + } } }, canSeeAddList() { |