From 981ed546f1cae45ad8b92b393ee29c1a26277f32 Mon Sep 17 00:00:00 2001
From: Marc Hartmayer <hello@hartmayer.com>
Date: Thu, 23 Apr 2020 00:54:39 +0200
Subject: [PATCH] Newer versions of jQuery sortable use `uiSortable` key

Newer versions of jQuery sortable use `uiSortable` as key to store the data.
Let's adapt the code. While at it, refactor the code.
---
 client/components/cards/cardDetails.js   | 15 +++++---------
 client/components/cards/checklists.js    |  7 ++-----
 client/components/lists/list.js          | 15 ++------------
 client/components/swimlanes/swimlanes.js | 26 ++----------------------
 4 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index b958d5bf9..8fc3c12a1 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -278,17 +278,12 @@ BlazeComponent.extendComponent({
 
     // Disable sorting if the current user is not a board member
     this.autorun(() => {
-      if ($checklistsDom.data('sortable')) {
-        $checklistsDom.sortable('option', 'disabled', !userIsMember());
+      const disabled = !userIsMember() || Utils.isMiniScreen();
+      if ($checklistsDom.data('uiSortable')) {
+        $checklistsDom.sortable('option', 'disabled', disabled);
       }
-      if ($subtasksDom.data('sortable')) {
-        $subtasksDom.sortable('option', 'disabled', !userIsMember());
-      }
-      if ($checklistsDom.data('sortable')) {
-        $checklistsDom.sortable('option', 'disabled', Utils.isMiniScreen());
-      }
-      if ($subtasksDom.data('sortable')) {
-        $subtasksDom.sortable('option', 'disabled', Utils.isMiniScreen());
+      if ($subtasksDom.data('uiSortable')) {
+        $subtasksDom.sortable('option', 'disabled', disabled);
       }
     });
   },
diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js
index 5acab536c..8daf6ee7a 100644
--- a/client/components/cards/checklists.js
+++ b/client/components/cards/checklists.js
@@ -57,11 +57,8 @@ BlazeComponent.extendComponent({
     // Disable sorting if the current user is not a board member
     self.autorun(() => {
       const $itemsDom = $(self.itemsDom);
-      if ($itemsDom.data('sortable')) {
-        $(self.itemsDom).sortable('option', 'disabled', !userIsMember());
-      }
-      if ($itemsDom.data('sortable')) {
-        $(self.itemsDom).sortable('option', 'disabled', Utils.isMiniScreen());
+      if ($itemsDom.data('uiSortable')) {
+        $(self.itemsDom).sortable('option', 'disabled', !userIsMember() || Utils.isMiniScreen());
       }
     });
   },
diff --git a/client/components/lists/list.js b/client/components/lists/list.js
index 8574caf76..7ce520dce 100644
--- a/client/components/lists/list.js
+++ b/client/components/lists/list.js
@@ -139,23 +139,12 @@ BlazeComponent.extendComponent({
         });
       }
 
-      if ($cards.data('sortable')) {
+      if ($cards.data('uiSortable')) {
         $cards.sortable(
           'option',
           'disabled',
           // Disable drag-dropping when user is not member/is miniscreen
-          !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(),
+          !userIsMember() || Utils.isMiniScreen(),
           // Not disable drag-dropping while in multi-selection mode
           // MultiSelection.isActive() || !userIsMember(),
         );
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index b7a55ce6e..577bf6d27 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -122,34 +122,12 @@ function initSortable(boardComponent, $listsDom) {
     }
 
     const $listDom = $listsDom;
-    if ($listDom.data('sortable')) {
+    if ($listDom.data('uiSortable')) {
       $listsDom.sortable(
         'option',
         'disabled',
         // Disable drag-dropping when user is not member/is worker/is miniscreen
-        !userIsMember(),
-        // 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(),
+        !userIsMember() || Meteor.user().isWorker() || Utils.isMiniScreen(),
         // Not disable drag-dropping while in multi-selection mode
         // MultiSelection.isActive() || !userIsMember(),
       );