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

Make it compatible with newer and older versions of jQuery sortable

Browse source 
While at it, fix comments and prettify it.
This commit is contained in:
Marc Hartmayer 2020-04-25 09:48:56 +02:00
parent 7cf8487f57
commit 6d1cdebfe2
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -279,10 +279,10 @@ 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(() => {
const disabled = !userIsMember() || Utils.isMiniScreen(); const disabled = !userIsMember() || Utils.isMiniScreen();
if ($checklistsDom.data('uiSortable')) { if ($checklistsDom.data('uiSortable') || $checklistsDom.data('sortable')) {
$checklistsDom.sortable('option', 'disabled', disabled); $checklistsDom.sortable('option', 'disabled', disabled);
} }
if ($subtasksDom.data('uiSortable')) { if ($subtasksDom.data('uiSortable') || $subtasksDom.data('sortable')) {
$subtasksDom.sortable('option', 'disabled', disabled); $subtasksDom.sortable('option', 'disabled', disabled);
} }
}); });

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

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

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

@ -139,7 +139,7 @@ BlazeComponent.extendComponent({
}); });
} }
if ($cards.data('uiSortable')) { if ($cards.data('uiSortable') || $cards.data('sortable')) {
$cards.sortable( $cards.sortable(
'option', 'option',
'disabled', 'disabled',

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

@ -122,7 +122,7 @@ function initSortable(boardComponent, $listsDom) {
} }
const $listDom = $listsDom; const $listDom = $listsDom;
if ($listDom.data('uiSortable')) { if ($listDom.data('uiSortable') || $listDom.data('sortable')) {
$listsDom.sortable( $listsDom.sortable(
'option', 'option',
'disabled', 'disabled',