summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/components/activities/activities.js7
-rw-r--r--client/components/cards/cardDetails.js9
2 files changed, 12 insertions, 4 deletions
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index 186200ec..4f15d421 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -151,8 +151,9 @@ BlazeComponent.extendComponent({
},
attachmentLink() {
- const attachment = this.currentData().activity.attachment();
- const link = attachment.link('original', '/');
+ const activity = this.currentData().activity;
+ const attachment = activity.attachment();
+ const link = attachment ? attachment.link('original', '/') : null;
// trying to display url before file is stored generates js errors
return (
(attachment &&
@@ -166,7 +167,7 @@ BlazeComponent.extendComponent({
attachment.name,
),
)) ||
- this.currentData().activity.attachmentName
+ activity.attachmentName
);
},
diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index a57eddf9..d877421c 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -74,11 +74,18 @@ BlazeComponent.extendComponent({
scrollParentContainer() {
const cardPanelWidth = 510;
- const bodyBoardComponent = this.parentComponent().parentComponent();
+ const parentComponent = this.parentComponent();
+ // TODO sometimes parentComponent is not available, maybe because it's not
+ // yet created?!
+ if (!parentComponent) return;
+ const bodyBoardComponent = parentComponent.parentComponent();
//On Mobile View Parent is Board, Not Board Body. I cant see how this funciton should work then.
if (bodyBoardComponent === null) return;
const $cardView = this.$(this.firstNode());
const $cardContainer = bodyBoardComponent.$('.js-swimlanes');
+ // TODO sometimes cardContainer is not available, maybe because it's not yet
+ // created?!
+ if (!$cardContainer) return;
const cardContainerScroll = $cardContainer.scrollLeft();
const cardContainerWidth = $cardContainer.width();