From 46747b01fb3eb42901518a3fdb8a5f6d823465eb Mon Sep 17 00:00:00 2001
From: Maxime Quandalle <maxime@quandalle.com>
Date: Sun, 3 Jan 2016 23:22:08 +0100
Subject: Fix card infinite scrolling on card activities

I imagine blaze-component changed their Mixins API since I written
this code. We need some tests to avoid this kind of regressions when
updating dependencies!

Fixes #420
---
 client/components/cards/cardDetails.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'client/components/cards')

diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js
index bfe9f755..f6cd4140 100644
--- a/client/components/cards/cardDetails.js
+++ b/client/components/cards/cardDetails.js
@@ -8,8 +8,11 @@ BlazeComponent.extendComponent({
   },
 
   calculateNextPeak() {
-    const altitude = this.find('.js-card-details').scrollHeight;
-    this.callFirstWith(this, 'setNextPeak', altitude);
+    const cardElement = this.find('.js-card-details');
+    if (cardElement) {
+      const altitude = cardElement.scrollHeight;
+      this.callFirstWith(this, 'setNextPeak', altitude);
+    }
   },
 
   reachNextPeak() {
@@ -21,6 +24,7 @@ BlazeComponent.extendComponent({
     this.isLoaded = new ReactiveVar(false);
     this.parentComponent().showOverlay.set(true);
     this.parentComponent().mouseHasEnterCardDetails = false;
+    this.calculateNextPeak();
   },
 
   scrollParentContainer() {
-- 
cgit v1.2.3-1-g7c22