Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Newer versions of jQuery sortable use uiSortable key

Browse source 
Newer versions of jQuery sortable use `uiSortable` as key to store the data.
Let's adapt the code. While at it, refactor the code.
This commit is contained in:
Marc Hartmayer 2020-04-23 00:54:39 +02:00
parent c1287248a6
commit 981ed546f1
4 changed files with 11 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/components/cards/cardDetails.js
View file

@ -278,17 +278,12 @@ BlazeComponent.extendComponent({
// Disable sorting if the current user is not a board member // Disable sorting if the current user is not a board member
this.autorun(() => { this.autorun(() => {
if ($checklistsDom.data('sortable')) { const disabled = !userIsMember() || Utils.isMiniScreen();
$checklistsDom.sortable('option', 'disabled', !userIsMember()); if ($checklistsDom.data('uiSortable')) {
$checklistsDom.sortable('option', 'disabled', disabled);
} }
if ($subtasksDom.data('sortable')) { if ($subtasksDom.data('uiSortable')) {
$subtasksDom.sortable('option', 'disabled', !userIsMember()); $subtasksDom.sortable('option', 'disabled', disabled);
}
if ($checklistsDom.data('sortable')) {
$checklistsDom.sortable('option', 'disabled', Utils.isMiniScreen());
}
if ($subtasksDom.data('sortable')) {
$subtasksDom.sortable('option', 'disabled', Utils.isMiniScreen());
} }
}); });
}, },

7
client/components/cards/checklists.js
View file

@ -57,11 +57,8 @@ BlazeComponent.extendComponent({
// Disable sorting if the current user is not a board member // Disable sorting if the current user is not a board member
self.autorun(() => { self.autorun(() => {
const $itemsDom = $(self.itemsDom); const $itemsDom = $(self.itemsDom);
if ($itemsDom.data('sortable')) { if ($itemsDom.data('uiSortable')) {
$(self.itemsDom).sortable('option', 'disabled', !userIsMember()); $(self.itemsDom).sortable('option', 'disabled', !userIsMember() || Utils.isMiniScreen());
}
if ($itemsDom.data('sortable')) {
$(self.itemsDom).sortable('option', 'disabled', Utils.isMiniScreen());
} }
}); });
}, },

15
client/components/lists/list.js
View file

@ -139,23 +139,12 @@ BlazeComponent.extendComponent({
}); });
} }
if ($cards.data('sortable')) { if ($cards.data('uiSortable')) {
$cards.sortable( $cards.sortable(
'option', 'option',
'disabled', 'disabled',
// Disable drag-dropping when user is not member/is miniscreen // Disable drag-dropping when user is not member/is miniscreen
!userIsMember(), !userIsMember() || Utils.isMiniScreen(),
// 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 // Not disable drag-dropping while in multi-selection mode
// MultiSelection.isActive() || !userIsMember(), // MultiSelection.isActive() || !userIsMember(),
); );

26
client/components/swimlanes/swimlanes.js
View file

@ -122,34 +122,12 @@ function initSortable(boardComponent, $listsDom) {
} }
const $listDom = $listsDom; const $listDom = $listsDom;
if ($listDom.data('sortable')) { if ($listDom.data('uiSortable')) {
$listsDom.sortable( $listsDom.sortable(
'option', 'option',
'disabled', 'disabled',
// Disable drag-dropping when user is not member/is worker/is miniscreen // Disable drag-dropping when user is not member/is worker/is miniscreen
!userIsMember(), !userIsMember() || Meteor.user().isWorker() || Utils.isMiniScreen(),
// Not disable drag-dropping while in multi-selection mode
// MultiSelection.isActive() || !userIsMember(),
);
}
if ($listDom.data('sortable')) {
$listsDom.sortable(
'option',
'disabled',
// Disable drag-dropping when user is not member/is worker/is miniscreen
Meteor.user().isWorker(),
// Not disable drag-dropping while in multi-selection mode
// MultiSelection.isActive() || !userIsMember(),
);
}
if ($listDom.data('sortable')) {
$listsDom.sortable(
'option',
'disabled',
// Disable drag-dropping when user is not member/is worker/is miniscreen
Utils.isMiniScreen(),
// Not disable drag-dropping while in multi-selection mode // Not disable drag-dropping while in multi-selection mode
// MultiSelection.isActive() || !userIsMember(), // MultiSelection.isActive() || !userIsMember(),
); );