diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-04-25 01:41:37 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2020-04-25 01:41:37 +0300 |
commit | 7263d7497fce3eb3ab014d099f903d68cfcb8e6b (patch) | |
tree | 64043e413566d006e8a19e281e9cb3591460cd78 /client/components/lists | |
parent | 5eb5ca5752c3930d056165fcad42d712a7138a3e (diff) | |
parent | 666186fee809ded9cedfb949cbb09fc41775954c (diff) | |
download | wekan-7263d7497fce3eb3ab014d099f903d68cfcb8e6b.tar.gz wekan-7263d7497fce3eb3ab014d099f903d68cfcb8e6b.tar.bz2 wekan-7263d7497fce3eb3ab014d099f903d68cfcb8e6b.zip |
Merge branch 'marc1006-mobile'
Diffstat (limited to 'client/components/lists')
-rw-r--r-- | client/components/lists/list.js | 17 | ||||
-rw-r--r-- | client/components/lists/listHeader.jade | 3 |
2 files changed, 4 insertions, 16 deletions
diff --git a/client/components/lists/list.js b/client/components/lists/list.js index 8574caf7..a0031b2f 100644 --- a/client/components/lists/list.js +++ b/client/components/lists/list.js @@ -129,7 +129,7 @@ BlazeComponent.extendComponent({ showDesktopDragHandles = false; } - if (!Utils.isMiniScreen() && showDesktopDragHandles) { + if (Utils.isMiniScreen() || showDesktopDragHandles) { $cards.sortable({ handle: '.handle', }); @@ -139,27 +139,16 @@ BlazeComponent.extendComponent({ }); } - if ($cards.data('sortable')) { + if ($cards.data('uiSortable')) { $cards.sortable( 'option', 'disabled', - // Disable drag-dropping when user is not member/is miniscreen + // Disable drag-dropping when user is not member !userIsMember(), // Not disable drag-dropping while in multi-selection mode // MultiSelection.isActive() || !userIsMember(), ); } - - if ($cards.data('sortable')) { - $cards.sortable( - 'option', - 'disabled', - // Disable drag-dropping when user is not member/is miniscreen - Utils.isMiniScreen(), - // Not disable drag-dropping while in multi-selection mode - // MultiSelection.isActive() || !userIsMember(), - ); - } }); // We want to re-run this function any time a card is added. diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 182fee9e..fa1faf34 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -30,10 +30,9 @@ template(name="listHeader") if canSeeAddCard a.js-add-card.fa.fa-plus.list-header-plus-icon a.fa.fa-navicon.js-open-list-menu - //a.list-header-handle.handle.fa.fa-arrows.js-list-handle else a.list-header-menu-icon.fa.fa-angle-right.js-select-list - //a.list-header-handle.handle.fa.fa-arrows.js-list-handle + a.list-header-handle.handle.fa.fa-arrows.js-list-handle else if currentUser.isBoardMember if isWatching i.list-header-watch-icon.fa.fa-eye |