From 77f8b76d4e13c35ea3451622176bbb69a4d39a32 Mon Sep 17 00:00:00 2001
From: "Sam X. Chen" <sam.xi.chen@gmail.com>
Date: Thu, 10 Oct 2019 22:57:40 -0400
Subject: Add Features: allowing lists to be sorted by modifiedAt when not in
 draggable mode

---
 client/components/swimlanes/swimlanes.jade | 16 ++++++-------
 client/components/swimlanes/swimlanes.js   | 36 +++++-------------------------
 2 files changed, 13 insertions(+), 39 deletions(-)

(limited to 'client/components/swimlanes')

diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade
index 3ad43777..8f07a01c 100644
--- a/client/components/swimlanes/swimlanes.jade
+++ b/client/components/swimlanes/swimlanes.jade
@@ -12,13 +12,13 @@ template(name="swimlane")
           unless currentUser.isCommentOnly
             +addListForm
     else
+      if currentUser.isBoardMember
+        unless currentUser.isCommentOnly
+          +addListForm
       each lists
         +list(this)
         if currentCardIsInThisList _id ../_id
           +cardDetails(currentCard)
-      if currentUser.isBoardMember
-        unless currentUser.isCommentOnly
-          +addListForm
 
 template(name="listsGroup")
   .swimlane.list-group.js-lists
@@ -26,20 +26,20 @@ template(name="listsGroup")
       if currentList
         +list(currentList)
       else
-        each lists
-          +miniList(this)
         if currentUser.isBoardMember
           unless currentUser.isCommentOnly
             +addListForm
+        each lists
+          +miniList(this)
     else
+      if currentUser.isBoardMember
+        unless currentUser.isCommentOnly
+          +addListForm
       each lists
         if visible this
           +list(this)
         if currentCardIsInThisList _id null
           +cardDetails(currentCard)
-      if currentUser.isBoardMember
-        unless currentUser.isCommentOnly
-          +addListForm
 
 template(name="addListForm")
   .list.list-composer.js-list-composer
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index 33a7991e..1bfc0f79 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -163,37 +163,11 @@ BlazeComponent.extendComponent({
           // the user will legitimately expect to be able to select some text with
           // his mouse.
 
-          if (Utils.isMiniScreen) {
-            const noDragInside = [
-              'a',
-              'input',
-              'textarea',
-              'p',
-              '.js-list-handle',
-              '.js-swimlane-header-handle',
-            ];
-          }
-
-          if (!Utils.isMiniScreen && !showDesktopDragHandles) {
-            const noDragInside = [
-              'a',
-              'input',
-              'textarea',
-              'p',
-              '.js-list-header',
-            ];
-          }
-
-          if (!Utils.isMiniScreen && showDesktopDragHandles) {
-            const noDragInside = [
-              'a',
-              'input',
-              'textarea',
-              'p',
-              '.js-list-handle',
-              '.js-swimlane-header-handle',
-            ];
-          }
+          const noDragInside = ['a', 'input', 'textarea', 'p'].concat(
+            Util.isMiniScreen || (!Util.isMiniScreen && showDesktopDragHandles)
+              ? ['.js-list-handle', '.js-swimlane-header-handle']
+              : ['.js-list-header'],
+          );
 
           if (
             $(evt.target).closest(noDragInside.join(',')).length === 0 &&
-- 
cgit v1.2.3-1-g7c22