From 406766a82bd594309c2790aa0c916237d457362d Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 3 Aug 2023 19:17:36 -0500 Subject: [PATCH 1/2] make default swimlane auto-height --- client/components/swimlanes/swimlaneHeader.js | 1 + client/components/swimlanes/swimlanes.jade | 2 +- client/components/swimlanes/swimlanes.js | 3 ++- models/users.js | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/client/components/swimlanes/swimlaneHeader.js b/client/components/swimlanes/swimlaneHeader.js index 929c7fa94..8306c322b 100644 --- a/client/components/swimlanes/swimlaneHeader.js +++ b/client/components/swimlanes/swimlaneHeader.js @@ -147,6 +147,7 @@ BlazeComponent.extendComponent({ ); // FIXME(mark-i-m): where do we put constants? + // also in imports/i18n/data/en.i18n.json if (height < 100 || !height) { Template.instance() .$('.swimlane-height-error') diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index f6fbaf920..c44b3958a 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -3,7 +3,7 @@ template(name="swimlane") +swimlaneHeader unless collapseSwimlane .swimlane.js-lists.js-swimlane(id="swimlane-{{_id}}" - style="height:{{swimlaneHeight}}px;") + style="height:{{swimlaneHeight}};") if isMiniScreen if currentListIsInThisSwimlane _id +list(currentList) diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js index 82af48c1d..fb190c157 100644 --- a/client/components/swimlanes/swimlanes.js +++ b/client/components/swimlanes/swimlanes.js @@ -227,7 +227,8 @@ BlazeComponent.extendComponent({ swimlaneHeight() { const user = Meteor.user(); const swimlane = Template.currentData(); - return user.getSwimlaneHeight(swimlane.boardId, swimlane._id); + const height = user.getSwimlaneHeight(swimlane.boardId, swimlane._id); + return height == -1 ? "auto" : (height + "px"); }, }).register('swimlane'); diff --git a/models/users.js b/models/users.js index 9caf834ea..800708233 100644 --- a/models/users.js +++ b/models/users.js @@ -798,7 +798,7 @@ Users.helpers({ if (swimlaneHeights[boardId] && swimlaneHeights[boardId][listId]) { return swimlaneHeights[boardId][listId]; } else { - return 270; //TODO(mark-i-m): default? + return -1; } }, From 7536c7b5321c9aed0c6cb22c21fa3c3b2f104ffc Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 3 Aug 2023 21:48:38 -0500 Subject: [PATCH 2/2] allow -1 as 'auto' --- client/components/swimlanes/swimlaneHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/swimlanes/swimlaneHeader.js b/client/components/swimlanes/swimlaneHeader.js index 8306c322b..a30e8d5c0 100644 --- a/client/components/swimlanes/swimlaneHeader.js +++ b/client/components/swimlanes/swimlaneHeader.js @@ -148,7 +148,7 @@ BlazeComponent.extendComponent({ // FIXME(mark-i-m): where do we put constants? // also in imports/i18n/data/en.i18n.json - if (height < 100 || !height) { + if (height != -1 && (height < 100 || !height)) { Template.instance() .$('.swimlane-height-error') .click();