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: 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 ++-----
 2 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'client/components/cards')

diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index b958d5bf..8fc3c12a 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 5acab536..8daf6ee7 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());
       }
     });
   },
-- 
cgit v1.2.3-1-g7c22